Merged from upstream.
Updated TI-M logo.
Merge branch 'master' of https://github.com/Sinar/fixmystreet