Merge branch 'Logging'

Conflicts:
	.gitignore
Retrieve project.properties