1) Created HD-friendly tiled map, 2) converted from model coords to pixel coords in cocos2d calls
merged in master and resolved conflicts
last conflict resolved with master