Merge origin/master

Conflicts:
	CMS/web/WEB-INF/jsp/resourceManagment/customerList.jsp