Pre merge comit
Merge branch 'master' of https://github.com/pashkov/Spontaneous

Conflicts:
	diabetes/Spontaneous.MobileWebApp/Content/Custom.css
	diabetes/Spontaneous.MobileWebApp/Views/Meal/PreMeal.cshtml
PreMeal:
        Carbs num size fixes
        cars gray line changes
CarbBlame:
        Start work on view