styles cleanup
Merge branch 'Angular' of https://github.com/familiar-studio/Familiar into Angular

Conflicts:
	craft/templates/index.html
	public/css/familiar-bootstrap.css
	public/css/familiar.css
	public/styles/familiar.css
Merge branch 'Angular' of https://github.com/familiar-studio/Familiar into Angular