Added basic loggin. Startup script updated with log4j jvm property
Merge branch 'master' into feature/startup

Conflicts:
	server-launcher/scripts/start.sh