some changes
nix besonderes
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta

Conflicts:
	HakunaContacta/src/de/hakunacontacta/client/Page2.java
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta