Unique form component
The Contact Us page
Merge branch 'master' of https://github.com/alejandronanez/discostore2

Conflicts:
	discostore-content/src/main/content/jcr_root/content/discostore/en/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/address/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/captcha/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/checkbox/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/dropdown/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/hidden/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/image/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/imagebutton/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/link/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/password/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/radio/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/start/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/submit/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/tags/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/text/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/text/text.jsp
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/form/upload/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/i18n/es.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/page/contactus/content.jsp
	discostore-view/target/vault-work/jcr_root/apps/discostore/components/i18n/es.xml
i18n