Merge pull request #61 from XiDevelopment/master

Merge pull request #60 from XiDevelopment/icons
Bugfix, avatar selection dialog was sometimes opening multiple times.
Improved dialog handling, bugfixes and more.
Merge pull request #63 from XiDevelopment/icons

Improvement on Dialog Handling