made updates
Merge branch 'master' of github.com:TargetRAD/tgtrad-survey-api

Conflicts:
	app.js