Merge branch 'master' of https://github.com/cburgos/playlist-storytelling-template-js

Conflicts:
	source/app/stylesheets/playlist/ui/_sidePane