Fix FieldModel
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Update some accessors and mutators