Merge remote-tracking branch 'origin/Android-Services' into Android-Services

Conflicts:
	DirectMe/res/layout/activity_create_notification_buyer.xml
	DirectMe/res/values/strings.xml