edit page basic layout
Merge branch 'master' of git://github.com/concerto-cms/CoreBundle