Edit user form made
Merge branch 'master' of https://github.com/jbourdea/FreshBoxWebsite

Conflicts:
	__pycache__/dummy_data.cpython-33.pyc
	__pycache__/layouts.cpython-33.pyc
	__pycache__/views.cpython-33.pyc