moved the changes that needed to be syned from the 1.6 branch

At some point in time i will make a better version of the transpedia
that doesn't use image files