Merge branch 'master' of ssh://jaygallagher@source.oscartools.org:29418/oscar
Merge branch 'master' of ssh://jaygallagher@source.oscartools.org:29418/oscar
1011 add 12.1.1 integrator changes to master

DAOs
#3251 Admin Panel - Assign Role/Rights to Object - Scroll Bar Limit

Change-Id: I9088d734f02acb4c104480df21301db5a5baf513
#3250 Admin Panel Prevention Notification Settings - Scroll Bar Limit 

Change-Id: If6a2c9daf8045c3ac89025ca2ef2e662c0df6371
#3252 Admin Panel - OSCAR Status Report - Scroll Bar Limit

Change-Id: I288b14d4d93d76ac6ca91838e6a6ad06c3c173c2
deprecated some old utilities

Change-Id: Ie511f554d03cdb1b0be3cd19e6c86be7c80c30f5
removed round about references to "new Date()"

Change-Id: I9cf71b39eb7f1e612e2cd6ad0e74ffe70921b9c0
#3269 admin -> Style bug for iframes 

Change-Id: I3ee7302ed12d03ae2cdaebd4efbf5cb844c245df
Bug#2719 Can't search for unlinked lab file

fixed

Change-Id: Idd9c63b50a48fc5f171dac953a8a6c4824c8986e
#3271 Fix for searching Trip Database.  If there was a space in the 
search term it caused an error

Change-Id: I4be0f134063dfb0d135399c6586dce2a675b784e
Merge changes I4be0f134,Id757054d,I710c5839

* changes:
  #3271 Fix for searching Trip Database.  If there was a space in the  search term it caused an error
  Merge branch 'master' of ssh://jaygallagher@source.oscartools.org:29418/oscar
  Merge branch 'master' of ssh://jaygallagher@source.oscartools.org:29418/oscar
#3272 Add icd9 icd9:7902 ABN GLUCOSE TOLERAN TEST to trigger diabetes
flowsheet

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

Change-Id: I0665038fa52e1014b5b6cdc63d6c692361ab79ad
Merge "#3251 Admin Panel - Assign Role/Rights to Object - Scroll Bar Limit"
Merge "#3250 Admin Panel Prevention Notification Settings - Scroll Bar Limit "
Merge "#3252 Admin Panel - OSCAR Status Report - Scroll Bar Limit"
Merge "#3269 admin -> Style bug for iframes "
Merge "#3272 Add icd9 icd9:7902 ABN GLUCOSE TOLERAN TEST to trigger diabetes flowsheet"