Update item and itemFactory and a add a new mesh for box
Merge branch 'master' of https://github.com/Daepso/sma_ogre

Conflicts:
	sma-ogre/sma-ogre/program.cs