change ip address
Merge remote-tracking branch 'origin/code-merge' into code-merge

Conflicts:
	MpsgStarter/bin/MpsgStarter.apk
	MpsgStarter/bin/classes.dex
	MpsgStarter/bin/resources.ap_