cordova compatible
Merge branch 'master' of github.com:ekolesnikov/coffice

Conflicts:
	client/app/views/scan.html