User edit draft.
Merge branch 'master' of https://github.com/rommen/octagon

Conflicts:
	shoe-portal/src/Octagon/ShoePortal/CustomerBundle/Resources/config/routing.yml