wyr4137/ICS5-Map — pull request #384 by sandraj (2013-03-04 07:22:20+00:00)
Title: sandraj pull request 

i took off the conflicts again, i made sure there weren't anymore left.