update entities
minor changes to inventoryitem
Merge branch 'master' of git://github.com/Nilead/NileadCoreBundle
merged from Tuan