Rebase last 8 commits
Merge branch 'master' of github.com:nersoh/precodafeira

Conflicts:
	config/locales/en.yml
	db/seeds.rb