Merge origin/master

Conflicts:
	CMS/src/main/webapp/WEB-INF/jsp/employee.jsp
	CMS/src/main/webapp/WEB-INF/tags/general.tag