May as well ignore things that aren't formatted properly
Hotfix for bad data in DB
fixing dependencies
more dependency fixes
so cool
merge
I have no idea how this was working before
Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev
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
This should add the new -settings- page that will be incorperating the ability to change things like username and, most importantly, intervals for updates from JIRA.
Merge pull request #22 from ShadowSam/master

This should add the new -settings- page that will be incorperating the a...
Tested and fixed new settings page. Now works and properly linked
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