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

Conflicts:
	MeetMe/bin/classes/de/hfu/meetme/views/UserListFragment$1.class

MeetMe/bin/classes/de/hfu/meetme/views/UserListFragment$NetworkTask.clas
s
	MeetMe/bin/classes/de/hfu/meetme/views/UserListFragment.class