Add log4j dependency - Fix for Netbeans IDE

Change-Id: Iceb8f757a84cad7d8304375cc3486a252ef4b471
bug fix - added missing restoreTable call to fix build

Change-Id: Iac67dcc67b18fab3fd18058315f82ba90e1b2834
ID: 3607894 - Providers with Multiple Roles Unable to See Encounter Notes - bug fix

Change-Id: I24acebf51f58720637cb3217997354df17654087
Merge "Add log4j dependency - Fix for Netbeans IDE"
ID: 3612938 allow provider preferences to be retrieved over ws's

Change-Id: I6b76db7251de84d0a4af0a6e557f62701dc97750
3613510 - Alignment problem with echart notes

https://sourceforge.net/tracker/?func=detail&aid=3613510&group_id=66701&atid=515432
ID: 3613519 Add English Conversion to CDM indicators
ID: 3613593 Bug fix: Note Browser
Fix String index out of range,
Add vertical align to avoid jumping box
Remove encode because already decoded
Change displayed order to avoid scrolling down to see Tickler because Tickler is more important than acknowledgement data

Change-Id: I57e0cd0059bb4162d4e6057e9b185f1622146af9
ID: 3613641 integrated the sync component

Change-Id: I1e059a7ae74de42537db595f3afd609f43277a1a
bug fix to load form from appt screen

Change-Id: I5767f37b5b2b44f8ab72311ae2e96742361defe9
Merge "ID: 3612938 allow provider preferences to be retrieved over ws's"
ID: 3611948 - Feature -	New Administrative Panel w/ twitter bootstrap -
updated


and

ID: 3611950 - Feature - OSCAR User Interface Standardization 

some pictures added to:

https://sourceforge.net/tracker/?func=detail&aid=3611948&group_id=66701&atid=515435

Change-Id: I680d828d993a1631f03161f28e7c3688f0a9c488
ID: 3613154 - Hibernate to JPA conversion (Decision Support)

Change-Id: I80c1b2123007f30afda266ab1f399e5928c8beb1

patchset #2, removed the mydrugref timeout change, and removed a couple of transient annotations in favor of static final modifiers.
patchset #3, rebased, added final static to the class path variable
Merge "bug fix to load form from appt screen"
Merge "ID: 3613154 - Hibernate to JPA conversion (Decision Support)"
Change-Id: If24b02eb0378805873b1da043353de9e2aee56b6
ID: 3613154 - Hibernate to JPA conversion (Facility Message)

patchset2 - rebase
Merge "ID: 3613593 Bug fix: Note Browser Fix String index out of range, Add vertical align to avoid jumping box Remove encode because already decoded Change displayed order to avoid scrolling down to see Tickler because Tickler is more important than acknowledgement data"
Merge "ID: 3613519 Add English Conversion to CDM indicators"
Merge "ID: 3607894 - Providers with Multiple Roles Unable to See Encounter Notes - bug fix"
Merge "Change-Id: If24b02eb0378805873b1da043353de9e2aee56b6 ID: 3613154 - Hibernate to JPA conversion (Facility Message)"