On branch master (temp)

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

Conflicts:
	demos/grass/msvc2010/grass.suo
	demos/grass/src/grass_asset.cpp
On branch master (temp)

- temporary check in