changed ar_QA to ar & en_QA to en
ting tong
Merge branch 'master' of https://github.com/rajeshvarikkol/Metrash2Services

Conflicts:
	formicon.properties
	i18n.properties
	jssrc/iphone/nongenerated/communication.js
	lua_widget_m4_info.properties
	middleware.properties
	modules/js/communication.js
	resources/i18n/android_properties/ar.prop
	resources/i18n/android_properties/en.prop
	upgrade_actions_2.6.properties
	upgrade_actions_3.1.properties
	upgrade_actions_3.2.properties
	upgrade_actions_4.5.properties
	upgrade_actions_5.0.properties
	upgrade_actions_5.5.properties
	widgetinfo.properties
asdf
Merge branch 'master' of https://github.com/rajeshvarikkol/Metrash2Services

Conflicts:
	formicon.properties
	i18n.properties
	jssrc/iphone/nongenerated/communication.js
	lua_widget_m4_info.properties
	middleware.properties
	modules/js/communication.js
	resources/i18n/android_properties/ar.prop
	resources/i18n/android_properties/en.prop
	upgrade_actions_2.6.properties
	upgrade_actions_3.1.properties
	upgrade_actions_3.2.properties
	upgrade_actions_4.5.properties
	upgrade_actions_5.0.properties
	upgrade_actions_5.5.properties
	widgetinfo.properties