On branch master

- for merging origin
Merge remote-tracking branch 'origin/master'

Conflicts:
	configs/msvc2010/glf.suo
	demos/grass/msvc2010/grass.suo
On branch master (milestone)

- fix the thickness turning point bug