Moved endpoints outside of app.js
Merge branch 'master' of https://github.com/badamowski/DSMHack

Conflicts:
	app.js
	server/Model/models.js
Merge branch 'master' of https://github.com/badamowski/DSMHack