test 2
Merge branch 'master' of https://github.com/danielpacheco/aem_test.git

Conflicts:
	testrepo/testrepo-view/src/main/content/jcr_root/apps/testrepo/components/global.jspx
Merge branch 'master' of https://github.com/danielpacheco/aem_test.git