Rev'ing buildsupport
Merge branch 'master' into dev/slickgrid-export