agregar roles a usuarios
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/home_controller.rb
	app/views/p_config/stations/choose_products.html.haml
	app/views/p_config/stations/index.html.haml
Merge branch 'master' of https://github.com/carloslfuentes/propymes