#3579 New UI - Appointment List display issue 

I added a space after comma in name changed name and time headings from
4 to 5. Screenshot added to ticket.

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

Change-Id: I80c640f7f8d65781d432d33f938dbd8715e9b5cd
#3429 generic minor bug fix ticket

credentials were not serialisable

Change-Id: I92c83ff306d0e35b92a46dce46c8b0b9803a5be5
 #3575 New UI Merged Demographic shows up on patient search
  #3587 New UI Appointments are out of order
#3429 generic minor bug fix ticket

truncate is a function, not proceedure.

Change-Id: Id31986f2bda13b2a9cfe0c55dda89abf77ff5369
Merge " #3575 New UI Merged Demographic shows up on patient search"
Merge "  #3587 New UI Appointments are out of order"
Merge "#3579 New UI - Appointment List display issue "
The issue exists for mid and large resolutions so removed nav-justified
and add css to decrease the padding.

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

Change-Id: I49c44a729fa02b5ad1c3b042e0a1848aaa35ec54
#1100 Consult Print - Remove Referring Practitioner

The SFHC and MFP would like to remove the "Referring Practitioner" from
the consult print pdf. According to the clinics since this is populated
by the person editing the consult it is often in accurate and confusing
and adds to workload.

https://sourceforge.net/p/oscarmcmaster/feature-requests/1100/

Change-Id: I0913be5c01f497b448395190d52fb168e7cc73b8
Fix compilation problem using java 7

Change-Id: I1b30a37bc82289d96c13157572bd17723ca2e1ff
Bundle java melody with oscar

Change-Id: I6c4967cf135773c59c9ec4961f7d4df7029d5c93
#1103 Consultation Form - Letterhead Name drop down change Edit 

https://sourceforge.net/p/oscarmcmaster/feature-requests/1103/

Change-Id: I4a2116801031474b2e53da8e10381611944e21cc
  #2575 Measurement Links in Labs Displaying Values for the Wrong Measurement Type
Merge "The issue exists for mid and large resolutions so removed nav-justified and add css to decrease the padding."
Merge "Bundle java melody with oscar"
Merge "  #2575 Measurement Links in Labs Displaying Values for the Wrong Measurement Type"
Multiple fixes

1 Change fax code from using sf.net.JSON to jackson bug #3607
  This eliminates error of json parser not finding setter method for id of faxjob

2 Change date parsing of labAction for chart to include format for life labs. bug #3608

3 Remove sorting of drugs when user clicks on all in rx module
  this is a temporary fix as the sorter is not accepted by java 7. See bug #3599

4 Fix javascript in Rx Module to not check for pharmacy id if no pharmacy is present bug #3609

Change-Id: Iab8de7f559aad5c69715a1b5e8c8471b500cdae9
feature #1072 Hide admin buttons to those users who don't have admin privs

Change-Id: Ic56a9654d8fc7df7857a3b9a5595d1a4b6be5adc
Bug #3090 Billing -> End Year Statement -> Print PDF generates empty file