Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 50 insertions, 39 deletions

diff --git a/.gitignore b/.gitignore
index 0c61bbc38..b01074eaa 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,55 +1,66 @@
-favicon.*
-.htconfig.php
-\#*
-include/jquery-1.4.2.min.js
+## Ignore tmp, backup, logs and other junk files
+*~
 *.gz
-*.log
 *.out
-*.version*
-home.html
-addon
-*~
-.*.swp
-compiled/
-custom/
-/store/
-
-# site apps
-apps/
-
+*.bak
+*.swp
+*.log
+*.lock
+*.kate-swp
+#Ignore emacs tempfiles
+\#*
 # patch attempts
 *.orig
 *.rej
+# OSX .DS_Store files
+.DS_Store
+Thumbs.db
 
-# composer files (for fetching sabre)
-composer.*
 
-#ignore documentation, it should be newly built 
-doc/api
+## Ignore RedMatrix site specific files and folders
+.htconfig.php
+favicon.*
+addon/
+custom/
+/store/
+# site apps
+apps/
+# default startpage
+home.html
+# Ignore site TOS
+doc/SiteTOS.md
+# themes except for redbasic
+view/theme/*
+! view/theme/redbasic
+# site theme schemas
+view/theme/redbasic/schema/default.php
+# Doxygen API documentation, run 'doxygen util/Doxyfile' to generate it
+doc/html/
+# zotsh configuration files
+.zotshrc
+# external repositories for themes/addons
+extend/
 
-#ignore reports, should be generted with every build
-report/
 
-#ignore config files from eclipse, we don't want IDE files in our repository
+## exclude IDE files
+# config files and folders from Eclipse
 .project
 .buildpath
 .externalToolBuilders
-.settings
-
-#ignore OSX .DS_Store files 
-.DS_Store
-
-#netbeans project folder
-nbproject
-
-#Kdevelop project files
+.settings/
+# NetBeans project folder
+nbproject/
+# Kdevelop project files
 *.kdev4
+# PHPStorm
+.idea/
 
-# Ignore site TOS
-doc/SiteTOS.md
 
-#Ingore site theme schemas
-view/theme/redbasic/schema/default.php
+# composer files (at the moment composer is not officially supported and only used to add SabreDAV, we should add these)
+composer.* 
 
-#Ignore emacs tempfiles
-.#*
+# When we include composer we should exclude vendor/
+#vendor/
+# Exclude at least some vendor test files, examples, etc.
+vendor/sabre/*/tests/
+vendor/sabre/*/examples/