Pojos and Services commented
Merge branch 'flo'