fix
Merge branch 'content' of git://github.com/c2is/BigfootContentBundle into content