scanner working with app
Merge branch 'master' of github.com:ekolesnikov/coffice

Conflicts:
	client/app/images/icon_medium.png
	client/app/images/icon_small.png
	client/app/styles/main.scss
	client/app/views/scan.html
	client/dist/index.html
	client/dist/styles/main.8a9240a5.css
	client/dist/styles/main.c4a62766.css
	client/dist/styles/main.f5cdc579.css
	client/dist/views/scan.html
fixing merge