Location changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/anrlabs/reminders/NewReminder.java
	app/src/main/java/com/anrlabs/reminders/TimeFragment.java
Location changes