updated play services lib.
deneme
added missing string.
test server ip
ignore
social media integration.
Social media checkboxes added
Merge remote-tracking branch 'origin/social_media_integration'

Conflicts:
	Butterfly_JavaCV/res/values/strings.xml
	Butterfly_JavaCV/src/com/butterfly/RecordActivity.java