new stuff
Merge branch 'master' of github.com:CodeSleeve/platform-core

Conflicts:
	src/assets/javascripts/platform/backend.js