some renaming
Merge remote-tracking branch 'origin/master'

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