Minor bugfixes
Merge branch 'refs/heads/Feature/Uploader' into Feature/UploaderBugfix

Conflicts:
	public/shift-media/javascript/uploader.js
	public/shift-media/js/uploader.min.js
Merge branch 'refs/heads/Feature/UploaderBugfix' into Feature/Uploader