search based on friend's preferences
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Preferences.scala
search based on friend's preferences (added list of categories)