Slot picker with 'alternative' slots
Merge branch 'alternative' into release/20140828

Conflicts:
	app/assets/stylesheets/application.css.sass