Updating Enzyme portal Web module
Merge origin/master

Conflicts:
	enzyme-portal/ep-website/src/main/webapp/resources/javascript/controllers.js
updating ep -data module
updating ep -base module
updating ep -web module
updating ep -EbeyeRest module
Merge origin/master

Conflicts:
	enzyme-portal/ep-website/src/main/webapp/resources/javascript/controllers.js
updating ep web module