Added form to add friends
Merge branch 'master' of github.com:remyzorg/aar_projet_2013

Conflicts:
	app/views/menu.scala.html