Merge pull request #1 from Rmarmorstein/master

stuff
Merge pull request #2 from Rmarmorstein/master

general updates and changes
Create World.java
Location is something :)
Merge pull request #3 from Xesau/patch-1

Location class and World base
Merge pull request #4 from Rmarmorstein/master

add the url for the wiki
Merge pull request #1 from Vizun/master

pull from master