Merge pull request #4 from petekrull/develop

Added rudimentary data handling to sync function.
+ added appdev-gma library
Merge branch 'develop' of https://github.com/appdevdesigns/nextsteps-sailsjs into develop

Conflicts:
	package.json
Add stubs for the server sync process
Merge pull request #5 from chemo318/develop

Add stubs for the server sync process
* fix missing auth when not authenticated.
Removed MAKE dependency for npm test.
Add a little more definition to NSS sync stubs; improve Unit tests
Use node-uuid package to make UUIDs
+ 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