bugfixes
Merge branch 'master' of https://github.com/Y-Hack-BU/activity-app

Conflicts:
	notifications.php