Merge branch 'master' of https://github.com/dxdisrupt/backend

Conflicts:
	public/javascript/main.js