Merge branch 'master' of github.com:ccantill/powergrid into ccantill_master
Merge branch 'master' of github.com:ccantill/powergrid into ccantill_master
Bugfixes:
- Fix to support older jquery versions which don't support negative indexes in selector
- templating  should only render the template and then delegate rendering to the grid
don't trigger sorting when resizing/moving columns
Bugfixes:
- Fix to support older jquery versions which don't support negative indexes in selector
- templating  should only render the template and then delegate rendering to the grid
-- row highlighting
-- treegrid fixes
Merge remote-tracking branch 'ccantill/master' into bugfix

Conflicts:
	web/extensions/columnmoving.js
	web/extensions/columnsizing.js
	web/extensions/templating.js
	web/powergrid.css
	web/powergrid.js
Merge remote-tracking branch 'origin/bugfix' into bugfix

Conflicts:
	web/extensions/templating.js
Merge pull request #8 from SamDeBlock/bugfix

Bugfix