Update location.php
Merge pull request #1119 from jessenorton/master

Update location.php
altering the admin template to account for mobiles and touch based input
Merge branch 'master' of https://github.com/opencart/opencart
more admin work done
Merge branch 'master' into development-feature-profiles

Conflicts:
	upload/admin/language/english/common/header.php
	upload/admin/view/template/common/header.tpl