implemented Lync update of location
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild