[DO NOT SUBMIT]#3143 Billing OHIP Simulation has bad formatting Edit 

I have updated the page so it loads in the dynamic content area and not
an iframe. This will will resolve the issue with the scroll bars and
allow the page content to adjust to the window with if maximized

https://sourceforge.net/p/oscarmcmaster/bugs/3143/


Change-Id: Ie1608ccd43335c7a10fd25d45b82cf9476098213
#3214 PHV - Vaccinations and #3216 PHV - STI Measurement 

added request rules
STI measurement should display for patients that are under the age of 50
only

Rubella and Varicella vaccinations (preventions) should display for
patients that are female and under the age of 50 only


Change-Id: I8a0e54d85435f7910665fe157ecf6b29b0c274a5
#3186 Billing from any place other than appointment screen sets provider
to 1

http://sourceforge.net/p/oscarmcmaster/bugs/3186/

Change-Id: I761fed380510aae4708d9061b1a0c0bd4f2a4d32
Feature#996 Create prevention record from eform

- Added: "prevention" summary template for eforms to create prevention
- Added: detail comments for different kinds of summary templates
- Removed: redundant method getInfo() in EFormUtil.java
- Changed: method getContent() to trim off white spaces (space, line-break, tab) from head & tail
- Changed: remove getAttribute() for "document" summary template to standardize all summary templates

Change-Id: I27442f4d5711e0069d936aeb7bd87cb1bb60df70
Merge "#3186 Billing from any place other than appointment screen sets provider to 1"
2575 Labs - Measurement links displaying wrong measurement types

Conflicts:

	src/main/webapp/lab/CA/ALL/labDisplay.jsp
Merge "[DO NOT SUBMIT]#3143 Billing OHIP Simulation has bad formatting Edit "
Merge "#3214 PHV - Vaccinations and #3216 PHV - STI Measurement "
Merge "Feature#996 Create prevention record from eform"
Merge "2575 Labs - Measurement links displaying wrong measurement types"
missing stream close()

patchset 2 : previous code *always* left at least 1 stream lingering, if
not 2

patchset 3 : I should have looked for more in this file...

patchset 4 : clean up hashtable reference and private scoped variables.

Change-Id: I63a39b88ceb5ef457a8b833fe455be6edc655619
#999 add cbi update reminder when master file changes

Change-Id: I97313b531ae7958153371e0ad69f02e0d5c3d9a6
#998 colour code CBI forms

Change-Id: Ib47df2c3dc1c0a15af6ce30f8ebf62c6c7be7fe7
disable mowhawk sharing center, it broke everyone elses cxf

Change-Id: If53e314027c764592460af9615a9d527d34b0365
Feature#904 Customize Preventions List and Alphabetize

- Added "Other" to prevention result list
- PreventionItems.xml to be customized on-site, can arrange item order to suite user need

Change-Id: I61237adb6eb863cdbdcf526888a80faf687ad29f
Bug#3229 Escaped eform html gets unecaped after 1st save during edit

Fixed

Change-Id: I70cdbeaa23a038a4aee1f1b4c53f225ec72668aa
#3231 admin nav item oscarLearning will not open

Change-Id: I73605e6a30aa40210394bf13af0af11102181c26
Merge "Bug#3229 Escaped eform html gets unecaped after 1st save during edit"
Merge "Feature#904 Customize Preventions List and Alphabetize"
Merge "missing stream close()"