code fixes
renamed to app.styl
Merge branch 'master' into design

Conflicts:
	app/scripts/controllers/app.coffee
	app/scripts/controllers/main.coffee
	app/scripts/directives/sub-view.coffee
	app/styles/app.styl
	app/views/main.html
adding backup fonts