Add styles features
Merge branch 'styles' into tmp

Conflicts:
	app/assets/javascripts/home.js