finished 10.2
Merge branch 'master' of https://github.com/drumwolf/galleria