added user test cases, and minor updates to User class
Merge branch 'master' into develop
update query to support paging
queries now support pagination
updated collections class for pagination
updated tests to easily switch between platform environments