added the search for food and Restaurant object with lacking implementation
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/phr/dao/sqlimpl/ActivityDaoSqlImpl.java