cleanup
Changelog & TODO update
Use std::function in MapScene
Merge branch 'develop'