move background_color to state from slide
add 'background' separation
Merge branch 'master' of github.com:walkerart/cinema_wall

Conflicts:
	app/views/admin/states/_form.html.haml