Oauth2 Python
fix
Merge branch 'master' into oauth/profile

Conflicts:
	hike/__init__.py
	hike/main.py
	hike/templates/index.html
End Of The Feature
Merge branch 'oauth/profile' into dev