Removed MAKE dependency for npm test.
+ added a DBHelper to help with our associated tables
Merge branch 'dbHelper' into develop
Merge pull request #6 from chemo318/develop

Add a little more definition to NSS sync stubs; improve Unit tests
Merge branch 'develop' of github.com:Gn13l/nextsteps-sailsjs into Gn13l-develop
Merge branch 'develop' of https://github.com/appdevdesigns/nextsteps-sailsjs into develop

Conflicts:
	package.json
added new models
Merge branch 'new_models' into develop

Conflicts:
	api/models/NSServerCampus.js
	api/models/NSServerCampusTrans.js
	api/models/NSServerUser.js
	api/models/NSServerUserCampus.js
Changed measurement_UUID field to measurement_id
Merge pull request #8 from petekrull/develop

+ Added Steps, TransactionLog and UserSteps
Added accessor functions to models; restructure NSS Sync service