28082014-2
Merge remote-tracking branch 'origin/master'

Conflicts:
	BikeChallengeApp/LogFiles/GroupsLog.txt