options fix
removed test log
fix onOrderUpdateEvent
fixed order status update
+getLocationCityId
histore update fixes
uninstallation fix
fixes due to upload event & upload agent
catalog export fix
event fixes
lang fix
number fix
Merge branch 'master'

Conflicts:
	intaro.intarocrm/classes/general/ICMLLoader.php
Add translations to ICML export
Delete update.php
fix JavaScript in step 5