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

Conflicts:
	app/src/main/java/com/anrlabs/reminders/NewReminder.java
Merge branch 'master' of https://github.com/Archie4Brasil/Reminders into michael

Conflicts:
	app/src/main/res/layout/activity_main.xml
Merge branch 'master' of https://github.com/Archie4Brasil/Reminders into michael

Conflicts:
	app/src/main/res/layout/activity_main.xml
Merge remote-tracking branch 'origin/michael'

Conflicts:
	app/src/main/java/com/anrlabs/reminders/NewReminder.java
Database update (merge)
Michael & Archie: 12/10/2014 15:10