Footer
Merge branch 'master' of https://github.com/alejandronanez/discostore2

Conflicts:
	discostore-content/src/main/content/jcr_root/content/dam/discostore/.content.xml
	discostore-content/src/main/content/jcr_root/content/dam/discostore/logo.jpg/.content.xml
	discostore-content/src/main/content/jcr_root/content/dam/discostore/logo.png/.content.xml
	discostore-content/src/main/content/jcr_root/content/dam/discostore/logo.png/_jcr_content/renditions/original
	discostore-content/src/main/content/jcr_root/content/discostore/en/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/album_preview/album_preview.jsp
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/album_preview/dialog.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/homepage/content.jsp