Before conflict
Merge branch 'dev' of https://github.com/florianmski/PixelDraw-Android into dev