renaming some activities for compiling reasons
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/de/team06/psychoapp/MainActivity.java
Merge remote-tracking branch 'origin/master'
- adding the AlarmMaker class (not completely finished)
  + you can add an alarm by using a valid date in unix time notation
     and by using the correct time section
  + you need only set the alarms for one day, it will be automatically
      repeat for other days up to infinity!
  + the remove alarm method is not implemented, but easily to construct
  + by adding an alarm the timecode will not be checked!!!

- adding the AlarmReceiver for catching the performing intent

- we have to make an activity ("SocialInteractionActivity") that will be performed
  by the alarm to show our input.xml layout
- fix android manifest csv-expoter entry
- remove csv-exporter from manifest, sry the preliminary fix was failed
- add SocialInteractionActivity
- adding tests for alarm maker class..
- btw: it rocks! :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/AndroidManifest.xml
	src/main/res/values/strings.xml