problem with array mergin in SkeletonController::getSerializerContext

sorry for my english: My environment is Windows 7, Apache 2.4.6, PHP 5.5.4. Problem in '+':
$a = array('ss');
$b = array('sd');
$merged = $a + $b;
var_dump($merged); // array('ss')
////////////
$a = array('s'=>'ss');
$b = array('a'=>'sd');
$merged = $a + $b;
var_dump($merged); // array('s'=>'ss','a'=>'sd')

array_merge work properly
Merge branch 'patch-1' of https://github.com/AmsTaFFix/extjs-bundle.git
Merge remote-tracking branch 'wakoch/master'
update model.js.twig view

return ODM support
add support for idProperty

by default PK in ExtJS Model is 'id', but it's not always.
add protection against field duplicate

when in association joinColumn->name = id_some, and we have field in Entity with name id_some. In result we have two fields with same names. This commit fix this problem.

Sorry for my english.
add default format for date field in ExtJS 4 Model

I'm working with Postgres and i don't want to inherit every model to set format to date fields. I think nobody wants.

Sorry for my english.
fix OneToOne association

Its try find JoinColumn in annotation of <targetEntity>::<mappedBy> property, but in OneToOne "mappedBy" option is not required.

Sorry for my English
Merge branch 'master' of https://github.com/AmsTaFFix/extjs-bundle into AmsTaFFix-master
added ability to override the field parameter