index on master: b952f22 updated to jquery ui 1.9.2 and jquery 1.8.3
WIP on master: b952f22 updated to jquery ui 1.9.2 and jquery 1.8.3
Merge commit '0cbac84809552822ef5343f4c2936172d4e818b4'
added get_model_name() to fields and converted existing templates
added trait detection to core::init_cfg
updated core::get_fields to pull self fields and parent fields
added owner_field method to core
fixed issue in core::set
added test super trait
started adding model_trait
core::get_fields now loads direct trait fields
field->model can now point to a model or a trait
fixed ugly _Id hack in model model
added fields field to model_trait
fixed relationship-array template issues
fixed validation template issue
added trait_fields template
fixed position issue in set
Merge branch 'traits-dev' of https://github.com/supermodlr/supermodlr into traits-dev
Conflicts:
	classes/Supermodlr/Core.php

Set default model label for api extends
core looks for fields in traits
added traits to model_field.model source
fixed ugly id hack
added traits to model_model and class file generation
Added traits field to model_trait
fixed some issues with relationship and validation templates
added trait fields template
moved trait functions out of super trait into core
enabled traits on traits on form and class file generation