Merge branch 'master' of https://github.com/localore/Reinvention-Stories
Merge branch 'master' into map-act2-combined