modified:   config/application.rb
	renamed:    config/mail_config.yml -> config/env_config.yml
	modified:   db/seeds.rb
	modified:   test/integration/modulo_usuario_test.rb
	deleted:    db/migrate/20130929042252_change_earth_usage_column.rb
Merge branch 'development' of github.com:sbianchi/wira into development
	new file:   arreglateMalditaDB.sh
	modified:   db/seeds.rb