Maze - little features
Merge branch 'dev' of https://github.com/MetropoliaPortal/Mimmit into dev