Big merge in Item.java
Merge branch 'master' of https://github.com/idmobema/skolprojekt