manager.js highlight function modified
Merge branch 'master' of https://github.com/maicf/ARClient

Conflicts:
	resources/js/manager.js