FormType select changed to "choice"
Merge branch 'bugfix' of git://github.com/jbbrunsveld/AttributeBundle into bugfix