Move map section to wiki and update finance section (a little)
Merge branch 'dev'