semantic -- fixing breaking tests after updating UI
backwardz -- remove protected attribute gem & unnecessary config.*
Merge branch 'develop'
semantic -- copy change for spacing (OCD FTW!)
Merge branch 'develop' into resolve

Conflicts:
	app/views/layouts/application.html.erb