#3180 Adding tickler from Master is not populated with demographic
http://sourceforge.net/p/oscarmcmaster/bugs/3180/

Change-Id: I4847b1cc4ab045c95082524e98a955b5487f5149
#3181 Inactive documents categories continue to show on inbox and
document management screens 
http://sourceforge.net/p/oscarmcmaster/bugs/3181/

Change-Id: Ia129a65e3b90895b546501155096b7526217bd94
#3182 - Demographic not added to admissions table
Merge "#3180 Adding tickler from Master is not populated with demographic http://sourceforge.net/p/oscarmcmaster/bugs/3180/" into RELEASE_12_1
Merge "#3181 Inactive documents categories continue to show on inbox and document management screens  http://sourceforge.net/p/oscarmcmaster/bugs/3181/" into RELEASE_12_1
Merge "#3182 - Demographic not added to admissions table" into RELEASE_12_1
Bug#2994 Saved empty string Query names do not display

- fixed by forcing users to enter a name before saving query
updated spanish properties table courtesy of Santiago Dejo

Change-Id: I1e6b612e3d6e84bb57354241d838a971ec62f6d1
#2927 Eform Generator lists background images in random order 

Uses the Java.util.Arrays class to sort image files

Change-Id: Ie1930357442600e09b318e760f894406668b6cc8
Merge "#2927 Eform Generator lists background images in random order " into RELEASE_12_1
Merge "Bug#2994 Saved empty string Query names do not display" into RELEASE_12_1
Merge "updated spanish properties table courtesy of Santiago Dejo" into RELEASE_12_1
#2715 Wrong description displayed for RA code 50
Merge "#2715 Wrong description displayed for RA code 50 " into RELEASE_12_1
3174 Mule Fails to generate appropriate CURHST.0 for Lifelabs audits
create key - simple bug fix to html
3195 keyfile format exported from oscar does not match mule's requirements
Merge "create key - simple bug fix to html" into RELEASE_12_1
Merge "3195 keyfile format exported from oscar does not match mule's requirements" into RELEASE_12_1