Merge branch 'dev'

Conflicts:
	requirements.txt
	tapiriik/services/Dropbox/dropbox.py
	tapiriik/services/Endomondo/endomondo.py
	tapiriik/services/RunKeeper/runkeeper.py
	tapiriik/services/Strava/strava.py
	tapiriik/settings.py
	tapiriik/sync/sync.py