Wokrflow buy albums with fixes...
Merge branch 'master' of https://github.com/alejandronanez/discostore2

Conflicts:
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/album_detail/album_detail.jsp
	discostore-view/src/main/content/jcr_root/apps/discostore/components/content/album_detail_home/album_detail_home.jsp
	discostore-view/src/main/content/jcr_root/apps/discostore/components/i18n/es.xml