style etc
Merge branch 'master' of github.com:patbuergin/first-responder

Conflicts:
	scss/style.scss
	www/css/ionic.app.min.css