UI changes
Merge branch 'dev' of github.com:florianmski/PixelDraw-Android into dev