pre merge
Merge branch 'master' of github.com:cwhitney/PretzelGui

Conflicts:
	samples/BasicSample/vc2012_cinder_dev/BasicSample.vcxproj.filters
Updated cinde085 vc example