Use better IP address system
Fix merge conflicts?
Fix conflicts (again!)

Conflicts:
	apiV3/index.js