Removed redundant files, added something i have forgotten
Merge remote-tracking branch 'origin/master' into Tiles