Merge branch 'master' of https://github.com/Cyclenerd/tapiriik into Cyclenerd-master

Conflicts:
	tapiriik/services/__init__.py
	tapiriik/services/service.py
	tapiriik/web/views/privacy.py