Correct ShowUp of 2/1 images
dd
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/directives/sv-flip-container.js
	app/scripts/directives/sv-switch-book.js
	app/views/directives/sv-switch-book.html
	app/views/directives/sv-switch-book.jade