first step
Merge branch 'master' of https://github.com/desarrollolocal/etiquetica

Conflicts:
	AcceptanceTests/features/steps/steps.rb