29082014-0
Merge remote-tracking branch 'origin/master'

Conflicts:
	BikeChallengeApp/Controllers/ReportController.cs
	BikeChallengeApp/LogFiles/UsersLog.txt