added registration
pip install django-registration
pip install python-social-auth
Merge remote-tracking branch 'origin/master'

Conflicts:
	pychan/.idea/workspace.xml
	pychan/db/database.sqlite3
	pychan/engine/models.py
	pychan/pychan/settings.py
	pychan/pychan/urls.py