Revert "Revert "Merge branch 'master' of https://github.com/reportgrid/c...

...lient-libraries""

This reverts commit 9c7e6fa109782bdd332cb2133f76debb072a7fd5.

Conflicts:
	reportgrid/js/src/v1/reportgrid-charts.js
	reportgrid/js/src/v1/reportgrid-query.js