Changed supported types list to include all our supported types, specific for an item
Merge branch 'master' of https://github.com/michboon/comp2014