views and styles
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	public/js/controllers/controllers.js