Added .gitignore
Changes made by Andi without merging other branches
Merge branch 'master' into settings

Conflicts:
	src/main/AndroidManifest.xml
	src/main/java/de/team06/psychoapp/AlarmMaker.java
added full Preferences Screen:
#set Probandcode
#set Alarms
#Adminstration Backend