asd
jg
Merge branch 'master' of https://github.com/KroshkaMu/uhg-2013

Conflicts:
	src/tu/kom/uhg/BuddiesActivity.java