Merge remote-tracking branch 'upstream/master'
GUI update + Theme generator Update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Resources/views/Badge/Profile/claim.html.twig
	Resources/views/Profile/profile.html.twig
	Resources/views/Tool/desktop/home/desktopHomeTabs.html.twig
small changes
Translation update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Resources/views/Tool/desktop/home/desktopHomeTabs.html.twig
Merge pull request #87 from solispauwels/master

GUI update + Theme generator Update