Switch button template
Switch button template
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/directives/sv-flip-container.js