Merge remote-tracking branch 'Nicexm/master'

Conflicts:
	system/cache/cache.currency.1414237871
	system/cache/cache.language.1414237871
	system/cache/cache.length_class.2.1414235528
	system/cache/cache.stock_status.2.1414235528
	system/cache/cache.store.1414235535
	system/cache/cache.tax_class.1414235528
	system/cache/cache.weight_class.2.1414235528
	system/cache/cache.zone.44.1414239114
Merge pull request #16 from Luobata/master

Merge remote-tracking branch 'Nicexm/master'