Missing Parsys
More from the Author on the detail page
Merge branch 'master' of https://github.com/alejandronanez/discostore2

Conflicts:
	discostore-services/src/main/java/com/boszdigital/discostore/beans/AlbumDetailBean.java
Merge branch 'master' of https://github.com/alejandronanez/discostore2

Conflicts:
	discostore-content/src/main/content/jcr_root/content/discostore/en/discDetailPage/.content.xml
	discostore-view/src/main/content/jcr_root/apps/discostore/components/i18n/es.xml