Merge branch 'master' of https://github.com/bstoker/gridappclient.git/