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

Conflicts:
	MeetMe/bin/MeetMe.apk
	MeetMe/bin/resources.ap_