Merge branch 'master' of https://github.com/loheiman/Dogma

Conflicts:
Dogma/ActiveWalkViewController.swift
Minor tweaks