Merge pull request #5 from cru-Luis-Rodriguez/master

update stage
update
Merge branch 'dev_cru_chef_server_custom_repo' into stage_cru_chef_server_custom_repo
 update metadata
update
Merge branch 'stage_cru_chef_server_custom_repo'

Conflicts:
	cookbooks/aem_disp_config/metadata.rb