wyr4137/ICS5-Map — pull request #295 by chuddle (2013-02-20 18:14:58+00:00)
Title: Resolved conflicts

Resolved conflicts