On branch master (temp)

- remove suo
Merge remote-tracking branch 'origin/master'

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

- ao map rendering bug