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

Conflicts:
	HakunaContacta/src/de/hakunacontacta/contactModule/ContactSourceField.java
	HakunaContacta/src/de/hakunacontacta/contactModule/ContactSourceType.java
	HakunaContacta/src/de/hakunacontacta/contactmodule/ContactSourceField.java
	HakunaContacta/src/de/hakunacontacta/contactmodule/ContactSourceType.java
	HakunaContacta/src/de/hakunacontacta/shared/ContactSourceField.java
	HakunaContacta/src/de/hakunacontacta/shared/ContactSourceType.java
changes in page 1 and 2 and more
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta

Conflicts:
	HakunaContacta/src/de/hakunacontacta/client/GreetingService.java
	HakunaContacta/src/de/hakunacontacta/client/Page1.java
	HakunaContacta/src/de/hakunacontacta/server/GreetingServiceImpl.java