Strange

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

Conflicts:
	MeetMe/bin/classes/de/hfu/meetme/examples/MMRefreshUsersExample.class
	MeetMe/bin/classes/de/hfu/meetme/examples/MMSendMessageExample.class
	MeetMe/bin/classes/de/hfu/meetme/examples/MMSendUserExample.class
	MeetMe/bin/classes/de/hfu/meetme/examples/MMSendUsers.class

	MeetMe/bin/classes/de/hfu/meetme/junittests/MMAddAndRemoveUsersTest.class
	MeetMe/bin/classes/de/hfu/meetme/junittests/MMNetworkTest$1.class
	MeetMe/bin/classes/de/hfu/meetme/junittests/MMNetworkTest.class
	MeetMe/bin/classes/de/hfu/meetme/junittests/MMSendMessageTest.class
	MeetMe/bin/classes/de/hfu/meetme/junittests/MMUserTest.class
	MeetMe/bin/classes/de/hfu/meetme/model/MMUser.class

	MeetMe/bin/classes/de/hfu/meetme/model/network/message/MMMessageType.class

	MeetMe/bin/classes/de/hfu/meetme/model/network/receiver/MMMessageReceiver.class

	MeetMe/bin/classes/de/hfu/meetme/model/network/receiver/MMMessageReceiverTask.class

	MeetMe/bin/classes/de/hfu/meetme/model/network/sender/MMMessageSender.class

	MeetMe/bin/classes/de/hfu/meetme/simulation/MMOnlineUserSimulation.class
	MeetMe/bin/classes/de/hfu/meetme/views/MMUserListButtonFragment$1.class
	MeetMe/bin/classes/de/hfu/meetme/views/MainActivity.class
	MeetMe/bin/classes/de/hfu/meetme/views/UserListActivity.class
	MeetMe/bin/classes/de/hfu/meetme/views/UserListFragment$1.class
	MeetMe/bin/classes/de/hfu/meetme/views/UserListFragment$2.class
	MeetMe/bin/classes/de/hfu/meetme/views/UserListFragment.class
	MeetMe/bin/classes/de/hfu/meetme/views/UserProfileFragment$1.class