r
Merge branch 'develop' of https://github.com/tuxskar/pixmind.git into develop