.
Merge branch 'master' of github.com:edwardsoo/StravaApp

Conflicts:
	index.php
	map.php
	src/StravaApiLib.php
.