so what
Merge branch 'master' of github.com:gboeselager/ContactManager

Conflicts:
	Projektdateien/Testplan ContactManager.xlsx
	doc/allclasses-frame.html
	doc/allclasses-noframe.html
	doc/constant-values.html
	doc/core/Config.html
	doc/core/Convert.html
	doc/core/ConvertDateLocale.html
	doc/core/DataSource.html
	doc/core/LayoutModules.html
	doc/core/SessionCounter.html
	doc/core/Validation.html
	doc/core/class-use/Config.html
	doc/core/class-use/Convert.html
	doc/core/class-use/ConvertDateLocale.html
	doc/core/class-use/DataSource.html
	doc/core/class-use/LayoutModules.html
	doc/core/class-use/SessionCounter.html
	doc/core/class-use/Validation.html
	doc/core/package-frame.html
	doc/core/package-summary.html
	doc/core/package-tree.html
	doc/core/package-use.html
	doc/customExceptions/NotAllowedException.html
	doc/customExceptions/class-use/NotAllowedException.html
	doc/customExceptions/package-frame.html
	doc/customExceptions/package-summary.html
	doc/customExceptions/package-tree.html
	doc/customExceptions/package-use.html
	doc/deprecated-list.html
	doc/help-doc.html
	doc/index-files/index-1.html
	doc/index-files/index-10.html
	doc/index-files/index-11.html
	doc/index-files/index-12.html
	doc/index-files/index-13.html
	doc/index-files/index-14.html
	doc/index-files/index-15.html
	doc/index-files/index-2.html
	doc/index-files/index-3.html
	doc/index-files/index-4.html
	doc/index-files/index-5.html
	doc/index-files/index-6.html
	doc/index-files/index-7.html
	doc/index-files/index-8.html
	doc/index-files/index-9.html
	doc/index.html
	doc/logic/ContactManager.html
	doc/logic/ContactSearchMode.html
	doc/logic/GroupManager.html
	doc/logic/UserManager.html
	doc/logic/class-use/ContactManager.html
	doc/logic/class-use/ContactSearchMode.html
	doc/logic/class-use/GroupManager.html
	doc/logic/class-use/UserManager.html
	doc/logic/package-frame.html
	doc/logic/package-summary.html
	doc/logic/package-tree.html
	doc/logic/package-use.html
	doc/model/BusinessContact.html
	doc/model/Contact.html
	doc/model/Group.html
	doc/model/Person.html
	doc/model/User.html
	doc/model/class-use/BusinessContact.html
	doc/model/class-use/Contact.html
	doc/model/class-use/Group.html
	doc/model/class-use/Person.html
	doc/model/class-use/User.html
	doc/model/package-frame.html
	doc/model/package-summary.html
	doc/model/package-tree.html
	doc/model/package-use.html
	doc/overview-frame.html
	doc/overview-summary.html
	doc/overview-tree.html
	doc/serialized-form.html
	doc/servlets/ContactDelete.html
	doc/servlets/ContactEdit.html
	doc/servlets/ContactExport.html
	doc/servlets/Controller.html
	doc/servlets/GlobalSearch.html
	doc/servlets/GroupDelete.html
	doc/servlets/GroupInsert.html
	doc/servlets/Login.html
	doc/servlets/Logout.html
	doc/servlets/ProfileEdit.html
	doc/servlets/UserDelete.html
	doc/servlets/UserEdit.html
	doc/servlets/UserLock.html
	doc/servlets/class-use/ContactDelete.html
	doc/servlets/class-use/ContactEdit.html
	doc/servlets/class-use/ContactExport.html
	doc/servlets/class-use/Controller.html
	doc/servlets/class-use/GlobalSearch.html
	doc/servlets/class-use/GroupDelete.html
	doc/servlets/class-use/GroupInsert.html
	doc/servlets/class-use/Login.html
	doc/servlets/class-use/Logout.html
	doc/servlets/class-use/ProfileEdit.html
	doc/servlets/class-use/UserDelete.html
	doc/servlets/class-use/UserEdit.html
	doc/servlets/class-use/UserLock.html
	doc/servlets/package-frame.html
	doc/servlets/package-summary.html
	doc/servlets/package-tree.html
	doc/servlets/package-use.html