solve commit conflicts, will add diabetes.suo after this commit
Spontaneous:
   Loop FlowMedal win
   Show list of medals in UserProfile
   "Medal Location bug" fix
   New coupons
Track: add location and RestuarntId to tracking (splank Log)
Try to fix sync error because "diabetes.v11.suo" file
Merge branch 'master' of https://github.com/pashkov/Spontaneous

Conflicts:
	diabetes/diabetes.v11.suo
UserActivity.cs Merge fix