move expire_short/long to CacheConst methods
::CacheSettings
datatable-sidescroll
wrap datatables with div.datatable-sidescroll
Merge branch 'hotfix_clients_error'
Merge branch 'master' into maintenance_mode

Conflicts:
	lib/includes/rails_extensions.rb