finished cholestech
Merge branch 'master' of https://github.com/ohsu/lgh-bp-cholestech

Conflicts:
	src/edu/ohsu/lgh/intgr/service/CholestechManager.java
	src/edu/ohsu/lgh/intgr/service/dto/CholestechDTO.java