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

Conflicts:
	HakunaContacta/src/de/hakunacontacta/client/ClientEngine.java
asf
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta
added return button to page to and repaired the vCard and xCard exports