Merge branch 'master' into angular

Conflicts:
	public/css/admin.css
css
getTitleAttribute for model contact
Merge branch 'angular' into demo