Merge branch 'dev'
Cleans up the complex query merge.

Brin Gaffey
added a login box to the admin console

added admin role to the admin user
fixed project creation bug.

removed permissions checks in the save method, moved them to create and update
Fixed Project update so it returns something other than null
Fixed Project update so it returns something other than null
Usermanager additions to allow Users to update all fields with correct permissions
Merge branch 'dev-core-bugfix-adminconsolelogin' of https://github.com/fracture91/wpi-suite-tng into dev-core-bugfix-adminconsolelogin
Fixed the UserDeserializer so it doesnt crash when you give it "" as an idNum and includes the password
Fixed permissions on delete
Fixed role changes in the admin console
Added 200 response codes for correct operation
Added a custom serializer for User and a unit test for it. This custom serializer is highly data-protective. It hides the passwords and the permission maps.
fixed Project's serialization unit test. Also, added comma trimming to the User.toJson array function
Added admin console support for adding team members
Cleans up Datastore by removing commented out code, adds in all required javadoc, updates project based searches to use IDNums not Names, Is ready to be doc'd on the wiki.

Gaffey
Merge branch 'dev-exemplar' into dev
Merge branch 'dev'
removed a few superfluous system.out.println statements from ProjectTest
Using the transient modifier, managed to hide User.password from any serializer attempting to expose it. This means it is hidden without pre-configuring the serializer. This also means that db4o will not store the password by default thus I added a special db4o configuration in DataStore enabling storage of transient fields. I fixed the unit test for UserManager.makeEntity so that it manually inserts the password field into the user string because User.toJSON no longer includes the password field.