Merge pull request #19 from ShadowSam/master

User story - organization wide feed
Hotfix for bad data in DB
Here come the POJO objects so the JSON parser doesn't break.
It looks like the POJOs did the trick and the parsing should work for entity collections now
Merge pull request #23 from ShadowSam/master

Tested and fixed new settings page. Now works and properly linked
Update build.sbt
Work on Initiative CRUD operations
Created a prototype admin tool for forcing a pull of entities from the target json repo
Merge branch 'dev' into Ingester

Conflicts:
	test/model_tests/UserTest.java
MORE FAKE APPLICATIONS RUNNING FOR DATABASE REASONS
Merge branch 'master' into dev

Conflicts:
	app/helpers/MongoControlCenter.java
	conf/application.conf
Adding in entity pages.
entityId is now a String field
Adding initiative page in routes and application
Added buttons that will (in the future) allow watching, subscribing and voting from the dashboard.