Added edit form
Migration added
Image bug fixed
Added errors displaying
Merge branch 'master' into changing_user_info

Conflicts:
	social/apps/core/forms.py
	social/apps/core/views.py
	social/templates/base.html
	social/urls.py
Added registration ability
Merge remote-tracking branch 'origin/master'