in
Merge branch 'master' of https://github.com/AlexVangelov/LincomRoIP

Conflicts:
	.gitignore
	AndroidManifest.xml
	Makefile
	bin/AndroidManifest.xml
	gen/com/lincomengineering/lincomroip/R.java
	res/menu/activity_main.xml
	res/values/strings.xml
	src/com/lincomengineering/lincomroip/MainActivity.java
	src/com/lincomengineering/lincomroip/lincomroip.java
	src/com/lincomengineering/lincomroip/lincomroipJNI.java
	swig/lincomroip.cxx
	swig/lincomroip.cxx~
	swig/lincomroip_wrap.cxx
zzz
merge
sip server settings