Merge pull request #44 from EtlamGit/master

final block ID update for upcomming 1.8
Support for viewing/browsing entities on the map
Merge pull request #45 from thewierdnut/int

Support for viewing/browsing entities on the map
Merge remote-tracking branch 'upstream/master'