custom ringtonepreference ist fertig
Merge branch 'master' of https://github.com/wuggi/softwareengineering

Conflicts:
	Project/bin/SocialIntelligence.apk
	Project/bin/classes.dex
	Project/bin/dexedLibs/android-actionbar-library-2b78e5017303295e4122d592321522a9.jar
	Project/bin/resources.ap_
	actionbar/bin/android-actionbar-library.jar