update index.html
update opporlink
jessie bak
notification used by activity
Merge pull request #19 from opporlink/statm

empty compose fix
jessie's newest
update op
merge newest
Merge pull request #20 from opporlink/jessie

Statm && Jessie
merge master
notification delete fix
= =
= =
Merge remote-tracking branch 'origin/master' into statm

Conflicts:
	app/controllers/Messaging.java
fixed just now
Merge branch 'master' into statm

Conflicts:
	app/views/SimpleUsers/infoCenter.html