55
Merge branch 'master' of https://github.com/daniel-cambium/bookso

Conflicts:
	js/settingsController.js