Switch back and forth
Merge remote-tracking branch 'origin/master'

Conflicts:
	ohsnapapp/app/controllers/Friend.scala
Switch back and forth