Fixed association vs field mapping conflict. Association always win.
Fixed php5.3 compatibility issue
Merge pull request #47 from iVariable/bugfix-assoc-vs-field-mapping-conflict

Fixed association vs field mapping conflict. Association always win.