Fixed DialogFragment

Fixed DialogFragment
Merge remote-tracking branch 'origin/master'
Rewrite DialogFragment

Rewrite DialogFragment and something else