fix bug1
Merge remote-tracking branch 'origin/master'

Conflicts:
	getIP.php
fix bug2