ID: 3605985 Tabular Day Sheet - oscarDay Sheet - wont print past 18:00
Rewrite the display logic for Tabular-style day sheet

ID: 3605985 Tabular Day Sheet - oscarDay Sheet - wont print past 18:00
Rewrite the display logic for Tabular-style day sheet (Remove
System.out.println to pass checkstyle validation)

ID: 3605985 Tabular Day Sheet (part 2 - css)

Fix the css issue - pointing to the wrong file path
ID: 3598093 - Release121 builds 42 - 47 Lab Row Display error
Utilize HashMap
Change-Id: I24acebf51f58720637cb3217997354df17654087
ID: 3607894 - Providers with Multiple Roles Unable to See Encounter Notes - bug fix

Conflicts:

	src/main/webapp/admin/providerRole.jsp
ID 3612125 ID 3612123 ID: 3612109 

Billing Code, Diagnosis Code, and Calendar transfer bugs
duplicate fixes of those merged to master on May 12

Change-Id: Ib34258365e039670b8eb2af9ec1b4db1d20aa5ba
ID: 3613553 RTL loss of images, measurements and user default values

Merged in lost functionality present in Oscar 11

Change-Id: I9e134fb14a48a1ab1f06c98c59424c7c32719ae8
Change-Id: I499cdb628aae40a132bde9319b0adf1aa78fb9cb
ID: 3613217 cpp dialog displayed off the screen
Keep the top position always positive
ID: 3613825 Prevention Td remains red despite dTap

Any vaccine containing dT, even if not on the schedule, in the last 10
years will obviate the need for repeat Td. Drools amended to match
(Technically also true for DT vaccines but those are not indicated
for adult use as they have too much Diptheria antigen to be used without
risk of significant reaction in adults.)

Change-Id: I86be5daf2423ebc7b853393ae52b42dcb278b442
ID: 3613243 Gap Appearing After Each Entry in CPP Sections

Remove the margin-bottom for li.cpp

Change-Id: I776e13b702293c83136b3816d7ef8d77ea760a97
ID: 3612850 - Blank Order Number in "Manage Billing Form" Deletes Codes

Change-Id: I1939625be45453a283f63d7fa521dd2c8b85fe96
ID: 3611859 - Appt. time 12:30 PM on a consult prints AM

Change-Id: If26c894c779e628a5cc7c5b46999cdb8878d7bdf
ID: 3613077 RTL eForms break with " or ' containing entities in the rs

Both single and double quotes when saved in the Rich Text Letter eForm
when reloaded break the eForm. This fix ensures that they are escaped
when saved. An update sql is offered based on RTL eForm date so as to
not clobber end user customised RTL

marc - rebase and clean up commit-msg

Change-Id: I6e74c1e2fa6b0aaa9031ebb7a96e0ab3989e7e1a
ID: 3611571 Inbox link apostrophe not escaped

Change-Id: Ic699fe759d9d403cb4831bc24adc2655d86b0a31
Merge "ID: 3611571 Inbox link apostrophe not escaped" into RELEASE_12_1
Merge "ID: 3605985 Tabular Day Sheet - oscarDay Sheet - wont print past 18:00 Rewrite the display logic for Tabular-style day sheet" into RELEASE_12_1
Merge "ID: 3613243 Gap Appearing After Each Entry in CPP Sections" into RELEASE_12_1
Merge "ID: 3611859 - Appt. time 12:30 PM on a consult prints AM" into RELEASE_12_1
Merge "ID: 3613077 RTL eForms break with " or ' containing entities in the rs" into RELEASE_12_1
Merge "Change-Id: I499cdb628aae40a132bde9319b0adf1aa78fb9cb ID: 3613217 cpp dialog displayed off the screen Keep the top position always positive" into RELEASE_12_1
ID: 3609480 - Clicking Cancel Add "null" to Roster Status Drop Down

marc - rebased

Change-Id: Ic0e4efd97157629daea14f83545b40011197ec79
ID: 3604049 - Consults Calendar Popup Not Showing Arrows

marc - rebased

Change-Id: I7a13450ee861282657f443ac6302dd39c90d6439