test commit
authoring tool back in action
merge
not losing grid_cols in author
Merge branch 'master' of github.com:Ecotrust/geosurvey into next-release
single run for js unit tests
Merge branch 'master' of github.com:Ecotrust/geosurvey into next-release