User controller related changes and Specs for tests
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp

Conflicts:
	specs/server/userModel.spec.js
User controller related changes and Specs for tests
Merge remote-tracking branch 'origin'
Moved saveUser, findUser from controller to dbSchema.
Modified tests accordingly.
Modified the database connection string to be based on either production of dev. environment.
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp

Conflicts:
	server/controllers/userController.js
re-adding file
re-adding file
Merge pull request #106 from suprbh/master

Change User Controller and add unit tests
Fix dropDB, createDB grunt tasks
Merge pull request #112 from ryojiosawa/grunt

Fix dropDB, createDB grunt tasks
Fixed routes, added more tests
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
more tests
Fixed routes, added more tests
more tests
minor changes
Merge remote-tracking branch 'origin'

Conflicts:
	server/controllers/userController.js
minor fixes
Merge pull request #115 from suprbh/master

Updated routes, specs for user Controller