blub
Merge branch 'master' of https://github.com/Seeem/MeetMe

Conflicts:
	MeetMe/bin/classes/de/hfu/meetme/service/MMNetworkService.class
	MeetMe/src/de/hfu/meetme/service/MMNetworkService.java