merge conflict
Merge branch 'master' of https://github.com/ChristianJGarrido/thejuke

Conflicts:
	ejbModule/WEB-INF/layouts/template.xhtml