Edited properties and updated android-support lib.
Merge remote-tracking branch 'micah/master'

Conflicts:
	facebook/.classpath
	facebook/project.properties