Merge branch 'master' of https://github.com/Archie4Brasil/Reminders into michael

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