Work on AlertDialogFragment
Merge branch 'master' of https://github.com/docplasma/android

Conflicts:

TaskReminder/src/com/docplasma/android/taskreminder/AlertDialogFragment.
java