geo commit
Merge branch 'master' of https://github.com/geoonn/onlineTrader-FULL

Conflicts:
	Resources/android/alloy/controllers/_dealer_footer.js
	Resources/android/alloy/controllers/_dealer_subfooter.js
	Resources/android/alloy/controllers/_dispatcher_footer.js
	Resources/android/alloy/controllers/_header.js
	Resources/android/alloy/controllers/_orderdetailheader.js
	Resources/android/alloy/controllers/_subheader.js
	Resources/android/alloy/controllers/dealer_composetracking.js
	Resources/android/alloy/controllers/dealer_daily_commission.js
	Resources/android/alloy/controllers/dealer_monthly_commission.js
	Resources/android/alloy/controllers/dealer_monthly_commission_detail.js
	Resources/android/alloy/controllers/dealer_newpost.js
	Resources/android/alloy/controllers/dealer_orderdetail.js
	Resources/android/alloy/controllers/dealer_orderlist.js
	Resources/android/alloy/controllers/dealer_ordertracking.js
	Resources/android/alloy/controllers/dealer_pos.js
	Resources/android/alloy/controllers/dealer_posdetail.js
	Resources/android/alloy/controllers/dealer_poslist.js
	Resources/android/alloy/controllers/dealer_settings.js
	Resources/android/alloy/controllers/dealer_statistic.js
	Resources/android/alloy/controllers/dealer_summary.js
	Resources/android/alloy/controllers/dispatcher_composetracking.js
	Resources/android/alloy/controllers/dispatcher_daily_commission.js
	Resources/android/alloy/controllers/dispatcher_home.js
	Resources/android/alloy/controllers/dispatcher_monthly_commission.js

Resources/android/alloy/controllers/dispatcher_monthly_commission_detail
.js
	Resources/android/alloy/controllers/dispatcher_orderdetail.js
	Resources/android/alloy/controllers/dispatcher_orderlist.js
	Resources/android/alloy/controllers/dispatcher_ordertracking.js
	Resources/android/alloy/controllers/dispatcher_settings.js
	Resources/android/alloy/controllers/dispatcher_summary.js
	Resources/android/alloy/controllers/index.js
	Resources/android/alloy/sync/sql.js

Resources/android/alloy/widgets/com.appcelerator.loading/controllers/wid
get.js
	app/config.json