begin implementation of icon update
end implementation of icon update
Merge branch 'updateIcon-01' of
https://github.com/hitec-luxembourg/DISP-MELM into updateIcon-01

Conflicts:
	src/main/java/lu/hitec/pssu/melm/persistence/dao/MapElementIconDAOImpl.java
	src/main/java/lu/hitec/pssu/melm/rest/MELMResource.java
	src/main/webapp/WEB-INF/jsp/updateIcon.jsp
	src/main/webapp/js/custom/updateIcon.js
Merge remote-tracking branch 'origin/updateIcon-01'

Conflicts:
	src/main/java/lu/hitec/pssu/melm/services/MELMService.java
	src/main/webapp/WEB-INF/jsp/icons.jsp