Set default locale to es
Merge branch 'master' of github.com:nicooga/psa_manager

Conflicts:
	config/application.rb