Minor changes before promotional video recording.
Merge branch 'develop' of github.com:thehelpsf/ChickTech into develop
update notifications when clicked on from the system tray.
Last minute fix of notifications.
Merge pull request #144 from thehelpsf/jing-develop

Chat message should appear below the list (where the user types) and animate up into place #108
Merge branch 'develop' into jing-develop

* develop:
  Last minute fix of notifications.
  update notifications when clicked on from the system tray.
  Minor changes before promotional video recording.

Conflicts:
	app/src/main/java/org/chicktech/chicktech/fragments/EventDetailsFragment.java