Redigert alarm pop-up (alarm.xml)
as
alarm setreapiting
Merge remote-tracking branch 'remotes/origin/refactorpreyoverview' into alarmbranch

Conflicts:
	res/layout/calender_row.xml
	src/com/example/snms/utils/SnmsPrayTimeAdapter.java
Merge complete
Alarm added
Fixed bugs in AlarmUtilities.java
Merge remote-tracking branch 'remotes/origin/alarmbranch' into refactorpreyoverview

Conflicts:
	AndroidManifest.xml
	res/layout/calender_row.xml
	src/com/example/snms/BaseActivity.java
	src/com/example/snms/HolidayListFragment.java
	src/com/example/snms/MainApplication.java
	src/com/example/snms/PreyCountDownTimer.java
	src/com/example/snms/PreyOverView.java
	src/com/example/snms/preylist/PreyOverviewFragment.java