Added config.properties file
Merge branch 'develop-net' into develop

Conflicts:
	src/main/resources/config.properties