bug fixes yeah!
Merge branch 'master' of https://github.com/ABstraktED/MeetMe