instalation activeadmin
Merge branch 'dev' of https://github.com/ciudadanointeligente/bill-it into dev

Conflicts:
	config/routes.rb