add fuction for Setting ip
Merge branch 'master' of https://github.com/amsDevelop/collaboration_team

Conflicts:
	src/com/sinopec/activity/MarinedbActivity.java
	src/com/sinopec/data/json/Constant.java