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

Conflicts:
	HakunaContacta/src/de/hakunacontacta/client/GreetingService.java
	HakunaContacta/src/de/hakunacontacta/client/GreetingServiceAsync.java
	HakunaContacta/src/de/hakunacontacta/client/Page1.java
	HakunaContacta/src/de/hakunacontacta/client/Page2.java
added annotations
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta

Conflicts:
	HakunaContacta/src/de/hakunacontacta/client/MyHistoryListener.java
added annotations