start of radio stuff
Merge branch 'master' of https://github.com/walkerart/cinema_wall

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