finishing backend stuff
Merge branch 'master' of https://github.com/ab22/Appxilio

Conflicts:
	Dashboard/app.js