Replacing AlertDialog with DialogFragment
Fixing tests
Merge pull request #660 from bhariharan/min_42

Replacing AlertDialog with DialogFragment