Testing gem
Countries translate on spanish
Merge branch 'master' of https://github.com/grapheno/core

Conflicts:
	app/views/layouts/shoppe/application.html.haml
	app/views/shoppe/countries/_form.html.haml
	app/views/shoppe/countries/edit.html.haml
	app/views/shoppe/countries/index.html.haml