Update status of data maps
Update status of data maps
Update to clarify progress
Merge branch 'develop'
Merge branch 'origin/master'

Conflicts:
	README.md
Remove VS leftovers
Merge branch 'master'