asd
Merge branch 'master' of https://github.com/euneto/android.git

Conflicts:
	RemindMed/AndroidManifest.xml
	RemindMed/res/values/strings.xml