dealer list layout redesign and fixed state bug for order details
Merge remote-tracking branch 'origin/onn_development'

Conflicts:
	views/dealer_settings.xml