Started with EditSip view
Merge branch 'master' of https://github.com/TeamBeta/AndroidPresence

Conflicts:
	bin/AndroidPresence.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/example/androidpresence/Contacts.class
	bin/classes/com/example/androidpresence/MainActivity.class
	bin/classes/com/example/androidpresence/R$layout.class
	bin/classes/com/example/androidpresence/R$menu.class
	bin/classes/com/example/androidpresence/R$string.class
	bin/classes/com/example/androidpresence/R$style.class
	bin/classes/com/example/androidpresence/R$styleable.class
	bin/resources.ap_
	gen/com/example/androidpresence/R.java
	src/com/example/androidpresence/Contacts.java