Code formatted and some enhancement to DAO
Partial BaseDAO completed
Diouf test upload
Merge remote-tracking branch 'origin/master'

Solved Conflicts:
	WebContent/ereportanalyticsnew/index.view.js
	WebContent/ereportanalyticsnew/reportTemplate.controller.js
	WebContent/ereportanalyticsnew/reportTemplate.view.js
	src/org/sap/era/dao/CellModelDAO.java
	src/org/sap/era/persistence/TableGroupModel.java
	src/org/sap/era/service/CellModelService.java
	src/org/sap/era/service/ExcelReadService.java
	src/org/sap/era/service/TableGroupModelService.java
	src/org/sap/era/service/excel/CmisHelper.java
	src/org/sap/era/service/excel/Control.java
	src/org/sap/era/service/excel/LabelControl.java
	src/org/sap/era/web/controller/ReportTemplateController.java