Interaction between contact list and messaging
Merge branch 'master' of github.com:lukegeiken4/Gifasent

Conflicts:
	gifasent/www/index.html
Garret's fault
Merge branch 'master' of github.com:lukegeiken4/Gifasent

Conflicts:
	gifasent/platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d
	gifasent/platforms/android/CordovaLib/ant-build/build.prop
	gifasent/platforms/android/CordovaLib/ant-build/classes.jar
	gifasent/platforms/android/ant-build/AndroidManifest.xml.d
	gifasent/platforms/android/ant-build/Gifasent-debug-unaligned.apk
	gifasent/platforms/android/ant-build/Gifasent-debug-unaligned.apk.d
	gifasent/platforms/android/ant-build/Gifasent-debug.apk
	gifasent/platforms/android/ant-build/Gifasent.ap_
	gifasent/platforms/android/ant-build/Gifasent.ap_.d
	gifasent/platforms/android/ant-build/build.prop
	gifasent/platforms/android/ant-build/classes.dex.d
	gifasent/platforms/android/assets/www/contacts.html