roles funcionando a medias, duplicacion de tablas
agregando valores a tabla rolifications sin duplicaciones
pasado todo a simple_form
Merge branch 'dev' of github.com:farfanoide/agalma into dev

Conflicts:
	app/views/backend/branches/_form.html.erb
	app/views/backend/branches/edit.html.erb
	app/views/backend/branches/show.html.erb