Merge develop into 0308-Notifications-restructure

Conflicts:
	mod/notifications.php

diff --cc .gitignore
index b300f579e299ab2526462792c2ac1bf03a338c83,b300f579e299ab2526462792c2ac1bf03a338c83..77151060d22b03c5add2627e2a6c558f2a0a4d15
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -42,3 -42,3 +42,16 @@@ nbprojec
  \r
  #ignore local folder\r
  /local/\r
++\r
++#other stuff\r
++.directory\r
++.gitignore\r
++\r
++/view/theme/Friendiboot\r
++/view/theme/Viereinhalb\r
++/view/theme/blog\r
++/view/theme/boheme\r
++/view/theme/clean\r
++/view/theme/suckerberg\r
++\r
++/addon/frio_hovercard\r