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

Conflicts:
	res/layout/activity_buddies.xml
	res/layout/activity_scores.xml
	res/layout/activity_settings.xml
	src/tu/kom/uhg/BuddiesActivity.java
	src/tu/kom/uhg/GenericActivity.java
	src/tu/kom/uhg/MainActivity.java
	src/tu/kom/uhg/ScoresActivity.java
Merge branch 'master' of https://github.com/KroshkaMu/uhg-2013

Conflicts:
	res/layout/activity_buddies.xml
	res/layout/activity_scores.xml
	res/layout/activity_settings.xml
	src/tu/kom/uhg/BuddiesActivity.java
	src/tu/kom/uhg/GenericActivity.java
	src/tu/kom/uhg/MainActivity.java
	src/tu/kom/uhg/ScoresActivity.java