Fix
Merge branch 'master' of github.com:colmsjo/develvm

Conflicts:
	excel_sandbox/lib/vba-json/json.xls
renamed