Add Settings to appache IP and port
Merge branch 'master' of github.com:tatianagrange/apisEtherpad

Conflicts:
	clientForAPI42/src/main/UseApi.java