Fixed some menus and added a null check in my comments
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics