Merge branch 'master' of https://github.com/holisticon/flynn-book-scanner

Conflicts:
	app/src/scripts/modules/services.js