Started writing fserver entity api
Merged incoming changes
corrected property name
Merge branch 'master' of github.com:coldfrontlabs/fserver