commit before mergee
Merge branch 'design' of https://github.com/arminakvn/equitabletod into design

Conflicts:
	app/assets/stylesheets/apps/main.less
	vendor/assets/stylesheets/custom.css