Map categories update

Added more categories
Made so that last loaded map saves
More strict category checking
Merge pull request #520 from robotboy655/lastmap

Map categories update