Switched to getActivity rather than getBroadcast for pending intents
Merge remote-tracking branch 'origin/dev' into alarm-dev