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

Conflicts:
	public/styles/familiar.css
	public/styles/familiar.less
sync