standardized CSS names
Merge branch 'dev' into aw_styling_outer_framework

* dev:
  standardized CSS names

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/backbone_initializer.js