Switched to getActivity rather than getBroadcast for pending intents
Merge remote-tracking branch 'origin/dev' into alarm-dev
Adding activity-reminder layout
[db] saved state
Merge remote-tracking branch 'origin/dev' into dan-dev
Added some logs, removed the boot receiver
Merge remote-tracking branch 'origin/dev' into dan-dev

Conflicts:
	project.properties
To API 17
Merge remote-tracking branch 'origin/dev' into dan-dev