On branch master (temp)

- work on walking example
On branch master (temp)
Merge remote-tracking branch 'origin/master'

Conflicts:
	configs/msvc2012/dxf.vcxproj.filters