Txoba
Merge branch 'Frontend'

Conflicts:
	app/views/encomendas/new.html.erb