jans änderungen
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta

Conflicts:
	HakunaContacta/src/de/hakunacontacta/client/MyHistoryListener.java
	HakunaContacta/src/de/hakunacontacta/shared/Constant.java
	HakunaContacta/src/de/hakunacontacta/shared/ExportTreeManager.java