Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master

Conflicts:
	apps/files/js/file-upload.js