stylesheets hell
Merge branch 'master' of https://github.com/ekolesnikov/coffice

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

Conflicts:
	client/app/styles/main.scss