well
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta

Conflicts:
	HakunaContacta/src/de/hakunacontacta/shared/Constant.java
	HakunaContacta/war/logout.html
fixed empty Add-Field exeption handling
fixed page2 right collum emptying