wyr4137/ICS5-Map — pull request #115 by viviac3 (2013-01-30 02:16:00+00:00)
Title: viviac3's new pull request

did i solve the conflict??