message
test
asdf
Merge branch 'master' of https://github.com/KroshkaMu/uhg-2013

Conflicts:
	AndroidManifest.xml
	project.properties
	res/layout/activity_buddies.xml
	src/tu/kom/uhg/BuddiesActivity.java
ascdf