Can change the ip address in the application
Merge branch 'master' of https://github.com/mlakhia/KnightsWatch-Android

Conflicts:
	res/values/strings.xml