Re-organization
Undo changed to Reset (clear picture)
More re-organization
Merge branch 'dev' of https://github.com/MetropoliaPortal/Mimmit into dev