a
Merge branch 'master' of github.com:RVladislav/inTercom

Conflicts:
	assets/stylesheets/intercom.css
Merge branch 'master' of github.com:RVladislav/inTercom
menu