Refactoring
Merge remote branch 'origin/develop' into develop

Conflicts:
	src/main/webapp/script/communication.js
Refactoring
Merge remote branch 'origin/develop' into develop