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

Conflicts:
	hike/__init__.py
	hike/main.py
	hike/templates/index.html
add schema.sql
pouet
End Of The Feature
Merge branch 'oauth/profile' into dev
add schema.sql
QF
QF2
QF3
Merge branch 'dev' of github.com:fhacktory/yoloswag into dev
Merge branch 'dev' of github.com:fhacktory/yoloswag into dev
QF4
	Merge branch 'dev' of github.com:fhacktory/yoloswag into dev
Add different POI
QF5
Merge branch 'dev' of ssh://github.com/fhacktory/yoloswag into dev
Merge branch 'dev' of github.com:fhacktory/yoloswag into dev
Merge branch 'dev' of github.com:fhacktory/yoloswag into dev