git wants me to commit
fixing merge problems
implemented expandablelist in profile fragment
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team2

Conflicts:
	UnisportBern/bin/UnisportBern.apk
	UnisportBern/bin/classes.dex