bog tryout
Merge branch 'master' of https://github.com/gion/movie-maker

Conflicts:
	app/scripts/controllers/main.js
Merge branch 'master' of https://github.com/gion/movie-maker
sortable updates