3337 Version Code Hard Coded in POM file

Fixed hard coded oscar version

Conflicts:
	jspc.xml
	pom.xml

Change-Id: I2a03b77aead4267eaed6b3bbaa435b7f576023a4
Bugfix for measurement validation

- prevent exception when a value contains "/" but is not a blood pressure measurement

Change-Id: I5be8a0574b38a0c34531bca194ac041b34e08412
id:1023 unthreadlocalling changes

Change-Id: I9233a79c132261ecaad432d6454b1e6b916631bd
ID: #2455  Change how casemanagement note id is inserted in link for documents

assigned to demographics.  This prevents note from being mislinked to wrong
note.

Change-Id: I9736160f33d898c6b4a15e82a654b2e81aea23ee
Prevent npe in billing time when using hospital billing

Change-Id: I48e5682fdff49a0383b7b0fc05466a7d962ad9d0
Verify edb is calculated correctly

Change-Id: I7ffbc44e451e368fb4b1999f8c4e5b104790c345
Merge "ID: #2455  Change how casemanagement note id is inserted in link for documents"
Merge "Prevent npe in billing time when using hospital billing"
Merge "Verify edb is calculated correctly"
ID: 3336 - MySQL Connector and DBCP cause performance degradation
           and outage
  * Changed the version of MySQL Connector/J to the latest version
  * Changed the version of DBCP to the latest 1.x version
  * Updated the properties file to reflect required legacy settings
    for MySQL Connector/J. If you've deployed a properties file to
    $CATALINA_HOME **you will need to change the db_name value to
    add the parameters from the versioned properties file**. If you
    don't do this you'll see a bunch of database exceptions about
    date being 0000-00-00

Change-Id: I4f6b1a9b344da312315d4c4ff6c1f4656d700ad5
#3344 Schedule Date Popup window too small 

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

Change-Id: I04b3b5e599b3e8a77a531575714334f2c656c3fe
 #831 Dispensing information

moved from 12.1 hamilton public health to master.
#3345 Color Chart links obsolete 

I removed the links but also added the color picker script that is being
used in Admin->Billing->Manage Service Code Display Styles. Since I
modified the js I also tested that the script still works in
Admin->Billing->Manage Service Code Display Styles.

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

Change-Id: If8fbd222ba48d2b8b3adaa1d512bae2fb0b33569
Merge "#3345 Color Chart links obsolete "