updated for mysql offset
Merge branch 'master' into demo/orbis