fos userbundle installed - do templating and fos facebookbundle
Cart done fix bug on cart to show qty of same product incrementing
Cart almost complete - switching to security
Done
finished old security model
.idea merge conflict fixed
.idea removed
cart confilcts fixed move to security
Facebook login added -- fix bug only my account can login
Media half way setup -- return to develop
fb
Fixed facebook login
Finished this feature
Merge branch 'feature/media' into develop

Facebook sonata user and admin bundle ok