added before_filter is_admin
added before_filter to RolesController
fixed iss31, cleaned up layout
Merge branch 'master' into iss31

Conflicts:
	app/models/user.rb
	config/routes.rb
	db/development.sqlite3
devbase
Merge branch 'iss31'