update
Created CustomJsonView for enclosed collections
Merge remote-tracking branch 'origin/master'
login fixed