12072014,0- Bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	BikeChallengeApp/Controllers/GroupController.cs
	BikeChallengeApp/LogFiles/EventLog.txt