Fix angular macro to calculate ng-model attribute
Merge branch 'master' of git://github.com/undf/ExtraFormBundle