changes from onn
Merge branch 'master' of https://github.com/geoonn/app

Conflicts:
	views/_dispatcher_footer.xml
	views/dealer_summary.xml