Merge branch 'master' of https://github.com/TinderBox/Design

Conflicts:
	UI/app/assets/stylesheets/ignite/settings.css.scss
Resolving conflicts?