Git annoys me
Merge branch 'master' of https://github.com/Seeem/MeetMe

Conflicts:
	MeetMe/bin/classes/de/hfu/meetme/views/SettingsSaveButtonFragment.class