renamed iphone icons back to proper names
merge3d with master