refactoring and testing of api
changes to the config
configuration
MyServer configuration
Merge remote-tracking branch 'origin/master'

Conflicts:
	KippenClient/src/at/bakery/kippen/client/activity/KippenCollectingActivity.java