scan page update
Merge branch 'master' of https://github.com/ekolesnikov/coffice

# By alex
# Via alex
* 'master' of https://github.com/ekolesnikov/coffice:
  cordova compatible
scan page update
Merge branch 'master' of https://github.com/ekolesnikov/coffice

# By alex
# Via alex
* 'master' of https://github.com/ekolesnikov/coffice:
  stuff

Conflicts:
	client/dist/index.html
	client/dist/styles/main.8a9240a5.css
	client/dist/styles/main.ea01cb9f.css
	client/dist/styles/main.f5cdc579.css
	client/dist/views/scan.html