solving unit test problems
make the DBService more query string based, rather than json based
Merge commit '7d45c01f8a587f9d650ad5f57047d94eeefd8e8f'

Conflicts:
	app/services/UserComponent.scala

Formatting Routes
Interim update