Merge branch 'master' of https://github.com/Warlander/deed-planner.git