new ico column
Merge remote-tracking branch 'origin/master'

Conflicts:
	RSlickGrid/RSlickGrid.php