daily profit and pap ma den
Merge branch 'master' of https://github.com/geoonn/onlineTrader-FULL

Conflicts:
	Resources/android/alloy/controllers/dealer_settings.js
	Resources/android/alloy/controllers/dispatcher_settings.js
	Resources/android/alloy/styles/dealer_monthly_commission.js
	Resources/android/alloy/styles/dealer_monthly_commission_detail.js
	Resources/android/alloy/styles/dealer_orderlist.js
	Resources/android/alloy/styles/dealer_ordertracking.js
	Resources/android/alloy/styles/dealer_pos.js
	Resources/android/alloy/styles/dealer_posdetail.js
	Resources/android/alloy/styles/dealer_poslist.js
	Resources/android/alloy/styles/dealer_settings.js
	Resources/android/alloy/styles/dealer_statistic.js
	Resources/android/alloy/styles/dealer_summary.js
	Resources/android/alloy/styles/dispatcher_composetracking.js
	Resources/android/alloy/styles/dispatcher_daily_commission.js
	Resources/android/alloy/styles/dispatcher_home.js
	Resources/android/alloy/styles/dispatcher_monthly_commission.js
	Resources/android/alloy/styles/dispatcher_monthly_commission_detail.js
	Resources/android/alloy/styles/dispatcher_orderdetail.js
	Resources/android/alloy/styles/dispatcher_ordertracking.js
	Resources/android/alloy/styles/dispatcher_settings.js
	Resources/android/alloy/styles/dispatcher_summary.js
	Resources/android/alloy/styles/index.js
	Resources/android/app.js
	Resources/android/html/dealer_statistic.html
	Resources/iphone/alloy/controllers/dealer_settings.js
	Resources/iphone/alloy/controllers/dealer_summary.js
	Resources/iphone/alloy/controllers/dispatcher_orderlist.js
	Resources/iphone/alloy/controllers/dispatcher_settings.js
	Resources/iphone/alloy/styles/_dealer_footer.js
	Resources/iphone/alloy/styles/_orderdetailheader.js
	Resources/iphone/alloy/styles/_subheader.js
	Resources/iphone/alloy/styles/dealer_composetracking.js
	Resources/iphone/alloy/styles/dealer_daily_commission.js
	Resources/iphone/alloy/styles/dealer_monthly_commission.js
	Resources/iphone/alloy/styles/dealer_monthly_commission_detail.js
	Resources/iphone/alloy/styles/dealer_newpost.js
	Resources/iphone/alloy/styles/dealer_orderdetail.js
	Resources/iphone/alloy/styles/dealer_orderlist.js
	Resources/iphone/alloy/styles/dealer_ordertracking.js
	Resources/iphone/alloy/styles/dealer_pos.js
	Resources/iphone/alloy/styles/dealer_posdetail.js
	Resources/iphone/alloy/styles/dealer_poslist.js
	Resources/iphone/alloy/styles/dealer_settings.js
	Resources/iphone/alloy/styles/dealer_statistic.js
	Resources/iphone/alloy/styles/dealer_summary.js
	Resources/iphone/alloy/styles/dispatcher_composetracking.js
	Resources/iphone/alloy/styles/dispatcher_daily_commission.js
	Resources/iphone/alloy/styles/dispatcher_home.js
	Resources/iphone/alloy/styles/dispatcher_monthly_commission_detail.js
	Resources/iphone/alloy/styles/dispatcher_orderdetail.js
	Resources/iphone/alloy/styles/dispatcher_orderlist.js
	Resources/iphone/alloy/styles/dispatcher_ordertracking.js
	Resources/iphone/alloy/styles/dispatcher_settings.js
	Resources/iphone/alloy/styles/dispatcher_summary.js
	Resources/iphone/alloy/styles/index.js
	Resources/iphone/app.js
	Resources/iphone/html/dealer_statistic.html
	app/alloy.js
	app/assets/html/dealer_statistic.html