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'
Merge pull request #107 from jjmerino/master

Add Locations API and tests
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
Complete setup of proximity routes.
Complete update function. Add spec file.
Remove bookshelf and knex from package.json.
Add documentation to proximity controller.
Establish working relationship between proximity controller and proximity routes.
Add specs for proximity endpoints. Export server in server.js
Add more tests for proximity controller.
Add primary key to proximity table.