Cambios Mac
Merge branch 'master' of https://github.com/carloslfuentes/propymes

Conflicts:
	app/models/p_config/station.rb