pasteCommit
Merge remote-tracking branch 'origin/master'
pasteCommit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/pages/wise/js/websocket/connect.js
Merge remote-tracking branch 'origin/master'
clientCreate ProjectElement