Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Debug/BookFace.BookFace-Signed.apk
	bin/Debug/BookFace.BookFace.apk
	bin/Debug/BookFace.dll
	bin/Debug/BookFace.dll.mdb
	bin/Debug/BookFace.pdb
	obj/Debug/BookFace.dll
	obj/Debug/BookFace.pdb
	obj/Debug/android/bin/BookFace.BookFace.apk
	obj/Debug/android/bin/classes.dex
	obj/Debug/android/bin/packaged_resources
	obj/Debug/android/bin/resources_and_assemblies
	obj/Debug/assemblies/BookFace.dll
	obj/Debug/assemblies/BookFace.dll.mdb
	obj/Debug/assemblies/Mono.Android.Support.v4.dll
	obj/Debug/assemblies/Parse.Android.dll
	obj/Debug/resolved_assemblies.txt
	obj/Debug/uploadflags.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	BookFace.userprefs
	MainActivity.cs
	Resources/Resource.designer.cs
	bin/Debug/BookFace.BookFace-Signed.apk
	bin/Debug/BookFace.BookFace.apk
	bin/Debug/BookFace.dll
	bin/Debug/BookFace.dll.mdb
	bin/Debug/BookFace.pdb
	obj/Debug/BookFace.csproj.FileListAbsolute.txt
	obj/Debug/BookFace.dll
	obj/Debug/BookFace.pdb
	obj/Debug/android/bin/BookFace.BookFace.apk
	obj/Debug/android/bin/classes.dex
	obj/Debug/android/bin/classes/bookface/bookface/R$id.class
	obj/Debug/android/bin/packaged_resources
	obj/Debug/android/bin/resources_and_assemblies
	obj/Debug/android/bookface/bookface/R.java
	obj/Debug/android/src/bookface/bookface/R.java
	obj/Debug/assemblies/BookFace.dll
	obj/Debug/assemblies/BookFace.dll.mdb
	obj/Debug/assemblies/Mono.Android.Support.v4.dll
	obj/Debug/assemblies/Parse.Android.dll
	obj/Debug/uploadflags.txt