Carsten dev machine added to config
Merge branch 'master' of github.com:AuScope/EAVL into EAVL-1

Conflicts:
	src/main/resources/config.properties