notification delete fix
Merge remote-tracking branch 'origin/master' into statm

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

Conflicts:
	app/views/SimpleUsers/infoCenter.html
Merge pull request #21 from opporlink/statm

notification delete fix
Merge pull request #24 from opporlink/statm

notification delete fix