ID: 3612052 Send and Archive Message Button

Added a send and archive button that will reduce user clicks when they
are replying to a message.
ID: 3612109 Diagnosis Code Transfer bug

Window closer was firing before function finished in some circumstances.
 Tested on trunk (and 12_1)
ID 3612123 Billing Code Transfer bug

This change tested on trunk will ensure that the window will not close
before the information is transfered
ID 3612125 Calendar transfer bug

This change ensoures that the information transfers before the popup
closes
ID: 3612233 Post billing the Appt screen fails to refresh

Window closes before refreshing the appt screen to indicate a bill has
been filed (and the user has to wait for the timer to get the updated
status indicated)
ID 3612426 Unlink mismatched lab results from demographic eChart

If the demographic selected is incorrect when an HL7 lab is automatically
routed to a patient's eChart, or a demographic is selected by the provider
for an unmatched lab result, it would be nice to be able to unlink the
mistaken lab from the demographic's eChart and return it as "Unmatched" to
the inbox of the requesting provider, so they can manually process the
labwork correctly.
We can require that a reason be provided for why the lab is being
unlinked, and log the unlink action to Oscar Audit logging, so it shows up
in the security report.

Change-Id: Idd96f0c737d296d4c9f6795c7e0945e517816afa
ID: 3612640 - inactive provider can still log in

Conflicts:

	src/main/java/oscar/login/LoginAction.java
ID: 3609015 - Feature - Health Tracker
-added "active" class to group buttons when selected
-when using flowsheet without a diagnosis warning appears added
dxtriggers as link so diagnosis can be made from the health tracker
-made flowsheet title larger/bolder

Change-Id: I7b1d417ebdaf400e9f8b9dd2a4bd14a9e96370da
ID: 3607894 - Providers with Multiple Roles Unable to See Encounter Notes
3607913 - eAAPs - Research Module

eAAPs specific backend changes

http://sourceforge.net/tracker/?func=detail&aid=3607913&group_id=66701&atid=515435
3607913 - eAAPs - Research Module

eAAPS specific front end changes

http://sourceforge.net/tracker/?func=detail&aid=3607913&group_id=66701&atid=515435
3607913 - eAAPs - Research Module

Added eAAPs documentation

http://sourceforge.net/tracker/?func=detail&aid=3607913&group_id=66701&atid=515435
ID: 3611619

also fixed allergies schema

Change-Id: Id6d626235ee4595686adf4c19519c03e53b05d91
refactored string as a constant for verification levels

Change-Id: I9f2b764bf7cfdaae7b4083a9b101534336cc2cda
refactored PhrVerification to user managers and move logic to manager
instead of DAO

Change-Id: Ida9c96a9bd1a372ed06eb115863bb38e351080b3
ID: 3612938 expose phr verification level from web services

Change-Id: I26420e22e4435de23c2501965016f44b5c711b25
ID: 3563797 - Added E2E Clinical Measurement Observation support
Refactored E2E Demographics object access
Added E2E Lab reference range support

Change-Id: I1f1bad080524a129504ba6aaa913aa4337e0036d
Signed-off-by: Jeremy Ho <jujaga@gmail.com>
ID: 3613077 eForms break with " or ' containing entities in the rs

Any HTML control character injected into an eForm by an apconfig.xml sql
risks "breaking" it. Better to escape it for the browser rather than
scrub it or expect clean data
ID: 3611774 ID: 3611963 UTF-8 for i18n BCNewBorn2008

Initial modification in preparation for conversion to UTF-8 encoding.
The row definition length needs to be under the 64K buffer. Hence a
minor trimming.  This will also allow for conversion from MyISAM
to InnoDB if desired.
Merge "3607913 - eAAPs - Research Module"