previews WIP
hmmm
Merge branch 'master' into previews

Conflicts:
	src/media/js/views/create.js