Merge pull request #404 from skpcharles/master

improvemnts on collection
*added missing constant for comment
Merge remote-tracking branch 'gooru/master'
Merge pull request #406 from cyrilraja/master

*added missing constant for comment
improvements on user entity