Signed-off-by: Jason Zan <jason.zan@sap.com>
Merge branch 'master' of
https://github.com/ufrays/eReportAnalyticsNew.git

Conflicts:
	WebContent/ereportanalyticsnew/reportTemplate.controller.js
	WebContent/ereportanalyticsnew/reportTemplate.view.js
	WebContent/pages/reportAdmin/ReportTemplatePreview.jsp
	src/beans.xml
	src/org/sap/era/persistence/TableGroupModel.java
	src/org/sap/era/web/controller/ReportTemplateController.java