added default group
Merge branch 'master' into development (which adds default group)
user roles default and admin
cancan
Merge branch 'development' into authorization

Conflicts:
	app/models/user.rb