new properties for User (descr, image, name)
Merge branch 'master' of github.com:paulovillani/camprulho

Conflicts:
	camprulho/urls.py