Updated SDK to commit 87c4e732015d00c41826f277f4da466f35f02d57
Updated SDK to commit e867b3122f913de69494f104d0555e0e38fa4ed0
Added facebook libs folder
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	res/values/colors.xml
	res/values/strings.xml