Re-introduced Build.scala
Merge commit 'b7a7f1768aa90b03c372db508b6f894b50385fb6'
Remove Specific Query
Merge commit '7d45c01f8a587f9d650ad5f57047d94eeefd8e8f'

Conflicts:
	app/services/UserComponent.scala

Formatting Routes
Interim update
Merge commit 'fc3381a99003b03562b209a45621edc1d1350aba'

Conflicts:
	app/controllers/UserController.scala
	app/models/User.scala
	app/services/DBServiceComponent.scala
	test/unit/controllers/UserControllerUnitSpec.scala
Merge pull request #11 from adatoo/master

Merge Arif & Jianfeng Code