Bug #2918 Re:Lab preview still displays BC lab documents incorrectly

Change-Id: I589e730344264719cb1a57d6d80a75083647fb42
Signed-off-by: Anita Kanyange <ak.kanyange@gmail.com>

Conflicts:

	src/main/java/oscar/oscarLab/ca/all/pageUtil/LabPDFCreator.java
	src/main/webapp/lab/CA/ALL/labDisplay.jsp
ID: #2950 Null Pointer exception opening labs

https://sourceforge.net/p/oscarmcmaster/bugs/2950/
Add info to messages in log output

Change behaviour of close with error to remain on the screen until
user closes it

Change-Id: Ie8812b1a9613e4ec063144b254beeda18e000ba9
Link to preimplementation report updated

Change-Id: I206336c0243ea478cc39634220b5238f14297d1a
#2917 - Billing Invoice displays message “Document expired”
ID: #2912 "Edit" function does not work as designed on Tickler page

https://sourceforge.net/p/oscarmcmaster/bugs/2912/
#2903 - “Error Page” appears when running search by provider name
#2956 BC Billing - Historical diagnostic codes are not listed in reverse chronological order
Merge "Bug #2918 Re:Lab preview still displays BC lab documents incorrectly"
Merge "ID: #2950 Null Pointer exception opening labs"
Merge "Add info to messages in log output"
Merge "Link to preimplementation report updated"
BPII and BPIS need to have the descriptions and display names swapped.

Change-Id: Ic1e8c5b045f00259da041d2166a6a418d174c86c

Conflicts:

	database/mysql/updates/update-2013-11-05.sql
Merge "#2917 - Billing Invoice displays message “Document expired” "
Merge "ID: #2912 "Edit" function does not work as designed on Tickler page"
Merge "#2903 - “Error Page” appears when running search by provider name "
Merge "#2956 BC Billing - Historical diagnostic codes are not listed in reverse chronological order"
ID: #2952 Generate OHIP File page displays physician's name as "null" if billing number is removed

https://sourceforge.net/p/oscarmcmaster/bugs/2952/
Merge "ID: #2952 Generate OHIP File page displays physician's name as "null" if billing number is removed"
Merge "BPII and BPIS need to have the descriptions and display names swapped."