deleted prototype and added FOSUserBundle
registration 80% + login + forgotPassword 50%
view/edit profile 50% + cart index twig + added 3 colls layout
finished edit/view profile
Merge remote-tracking branch 'upstream/master'
created Address entity linked 'one:one' to User + fixtures + show billing Address
pre edit form + edit form without validation
the bug 'same billing and shipping addr' solved + refactorized views
create read update shipping address
Merge pull request #2 from ahusar/master

Product Page & Category Page
merged upstream master
Merge pull request #3 from mzaharie/master

user login, register, forgot&reset password, edit&view profile all using FOSUser
Issue #4 :  deleted files and folders
Merge pull request #5 from mzaharie/master

Issue #4 :  deleted files and folders
updated img paths
added translatable
merged userBillingAddres feature with master
merged userBillingAddres feature with master (and deleted ~ files)
Merge branch 'master' of https://github.com/mzaharie/charlie
Merge pull request #6 from mzaharie/master

billingAddress