merge
Merge branch 'master' of https://github.com/wuggi/softwareengineering

Conflicts:
	Project/.project
	Project/AndroidManifest.xml
	Project/bin/AndroidManifest.xml
	Project/bin/R.txt
	Project/gen/de/Psychologie/socialintelligence/R.java
	Project/res/layout/activity_alarm.xml
	Project/res/layout/activity_pop_poll.xml
	Project/res/values/strings.xml
	Project/res/xml/preferences.xml
	Project/src/de/Psychologie/socialintelligence/ActivityRegistry.java
	Project/src/de/Psychologie/socialintelligence/AdminSettingsActivity.java
	Project/src/de/Psychologie/socialintelligence/Alarm.java
	Project/src/de/Psychologie/socialintelligence/Alarm_Activity.java
	Project/src/de/Psychologie/socialintelligence/BootActivity.java
	Project/src/de/Psychologie/socialintelligence/BootReceiver.java
	Project/src/de/Psychologie/socialintelligence/CustomRingtonepreference.java
	Project/src/de/Psychologie/socialintelligence/FileHandler.java
	Project/src/de/Psychologie/socialintelligence/FormatHandler.java
	Project/src/de/Psychologie/socialintelligence/MainActivity.java
	Project/src/de/Psychologie/socialintelligence/PopPollActivity.java
	Project/src/de/Psychologie/socialintelligence/SQLHandler.java
	Project/src/de/Psychologie/socialintelligence/UserSettingActivity.java
	Project/src/de/Psychologie/socialintelligence/Week.java
	README.md
Kontakte-Textfeld, beim verlassen Tastatur ausblenden + transparente BootActivity
Kontakte-Textfeld, beim verlassen Tastatur ausblenden + transparente BootActivity