ItemType class changed and added tests in testingDictionary.
Merge branch 'MergingError' of https://github.com/EvelynHischier/CityBuilder into MergingError
changed class ItemType