More UI stuff
Merge pull request #58 from rhokbrisbane/more_ui_stuff

More UI stuff
Merge branch 'master' into edit_resources

Conflicts:
	app/views/resources/_form.html.haml