More migrations, fixed tags, roles.
Merge branch 'master' of github.com:danickfort/xtable

Conflicts:
	app/controllers/groups_controller.rb