Added reminder option
Cleanup for merge to master branch

Removed obsolete ActivityCalendar.
Removed test buttons from ActivitySettings.
Added test functionality to ActionBar buttons of ActivitySettings.
Renamed resource