logging added
Merge branch 'master' of https://github.com/hendrikgit/vs3

Conflicts:
	.idea/workspace.xml