Merge pull request #19 from ShadowSam/master

User story - organization wide feed
Hotfix for bad data in DB
Merge branch 'master' into dev

Conflicts:
	app/helpers/MongoControlCenter.java
	conf/application.conf