minor change on order list and order detail
Merge branch 'master' of https://github.com/geoonn/app

Conflicts:
	views/dealer_settings.xml