master is reverted
Merge branch 'master' of https://github.com/chorus-frogs-2014/SafeRoute