Friends Template
Merge branch 'master' of github.com:GrinnellAppDev/FaceTag-iOS

Conflicts:
	FaceTag.xcodeproj/project.pbxproj
	FaceTag/LobbyViewController.m
Complete merge. Add ($SRC_PATH) for Crashlytics.