Contacts
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$1.class
bin/classes/com/example/androidpresence/MainActivity.class
bin/classes/com/example/androidpresence/R$id.class
bin/resources.ap_
gen/com/example/androidpresence/R.java
res/layout/accounts.xml
src/com/example/androidpresence/MainActivity.java
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$1.class
bin/classes/com/example/androidpresence/MainActivity.class
bin/classes/com/example/androidpresence/R$id.class
bin/resources.ap_
gen/com/example/androidpresence/R.java
res/layout/accounts.xml
src/com/example/androidpresence/MainActivity.java
Merge branch 'master' of https://github.com/TeamBeta/AndroidPresence

Conflicts:
	bin/R.txt
	bin/classes.dex
	bin/classes/com/example/androidpresence/Contacts.class
	bin/classes/com/example/androidpresence/MainActivity$1.class
	bin/classes/com/example/androidpresence/MainActivity.class
	bin/classes/com/example/androidpresence/R$id.class
	bin/resources.ap_
	gen/com/example/androidpresence/R.java
	res/layout/accounts.xml
	src/com/example/androidpresence/MainActivity.java