dispatcher completed and cancel button. task and my task icon
Merge branch 'master' of https://github.com/geoonn/app

Conflicts:
	views/dealer_ordertracking.xml