Implemented cleanup on server
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/src/main/resources/config.properties