adjust to latest fosuserbundle changes
adjust to latest doctrine changes
Pull changes from master
updates to use bootstrap3