Updated ios-core with NonConsumableItem changes
Merge branch 'master' into nci_to_ltvg
Merge branch 'nci_to_ltvg'
Merge branch 'master' into classname_for_all

* master:
  Updated ios-core with NonConsumableItem changes

Conflicts:
	submodules/soomla-ios-core
updating submodules + fixing native ios project