Added a first draft of the pupup on alarm
Merge branch 'master' of https://github.com/panda73111/rAppla.git

Conflicts:
	rAppla/AndroidManifest.xml
	rAppla/res/layout/layout_alarm_element.xml
	rAppla/src/app/rappla/activities/EventActivity.java
	rAppla/src/app/rappla/activities/RapplaActivity.java
	rAppla/src/app/rappla/alarms/Alarm.java
	rAppla/src/app/rappla/ui/fragments/AlarmFragment.java