Merge branch 'master' of https://github.com/Mobius5150/vip-scanner

Conflicts:
	js/vip-scanner.js
	vip-scanner.php