Merge pull request #409 from skpcharles/master

improvements on user entity
fixed NPE issue getCollectionItems API