temp reminder kev
Merge remote-tracking branch 'origin/kev_reminders'

Conflicts:
	.idea/modules.xml
	app/src/main/java/com/anrlabs/reminders/LocationFragment.java
	app/src/main/java/com/anrlabs/reminders/NewReminder.java
	app/src/main/res/layout/location_frag.xml
	app/src/main/res/layout/reminder_new.xml
Merge branch 'master' of https://github.com/Archie4Brasil/Reminders into michael

Conflicts:
	app/src/main/java/com/anrlabs/reminders/NewReminder.java
New changelist
temp reminder kev
Map update (merge)
Kevin & Archie: 12/11/2014 15:42
Merge remote-tracking branch 'origin/kev_reminders'

Conflicts:
	app/src/main/java/com/anrlabs/reminders/NewReminder.java
Switch Cancel for Save Button
 Archie: 12/11/2014 17:00
Merging databasehelper changes
Merge branch 'master' of https://github.com/Archie4Brasil/Reminders into michael

Conflicts:
	app/src/main/java/com/anrlabs/reminders/NewReminder.java
implementation of Alarm notification (in the works)
 Archie: 12/12/2014 15:05
Merge remote-tracking branch 'origin/michael'

Conflicts:
	.idea/modules.xml
	app/src/main/java/com/anrlabs/reminders/NewReminder.java
	app/src/main/java/com/anrlabs/reminders/TimeFragment.java
Weekend update:
- Singleton implementation to Database
Michael & Sandeep (Archie edit) 12/12/2014 15:29