working on progress dialog
Merge branch 'master' of https://github.com/holzleitner/GifMaker

# By Melkizedek
# Via Melkizedek
* 'master' of https://github.com/holzleitner/GifMaker:
  SettingsActivity
  SettingsActivity