Merge remote-tracking branch 'origin/master'

Conflicts:
	URFitProject/URFit/src/main/java/com/URFitness/FindBuddyActivity.java