merge probleme
Merge branch 'master' of https://github.com/AndiFritz/CustomerManager

Conflicts:
	CustomerManager/CustomerManager.userprefs