Committing to resolve issues.
Merge branch 'master' into responsive-design

Conflicts:
	app/View/Themed/Responsive/Books/book-make.ctp
Merge branch 'responsive-design'