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

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