Files as originally submitted.
Merge branch 'master' of https://github.com/m4rk4y/lonely-planet-extended