WIP styling
Merge branch 'master' of https://github.com/appception/appception into styling

Conflicts:
	client/app/app.scss
	client/app/main/main.html
converted sass to stylus
Merge pull request #86 from kwalker3690/styling

(fix) converted sass to stylus