Added some null handling on Tabs
Merge branch 'master' of https://github.com/haymh/Group-15-PlaceIt.git