the 'x' icons after the text fields in the contacts appear if the text fields have values
changed 'display:style' to 'style'
added timeout as a config field in SMSSync
modified grails-app/views/contact/_single_contact_view.gsp
modified save & test button layout on webconnection wizard
added job to create systemNotification when SMSSync times out. Currently not cancellable,  and may require migration to original quartz plugin
Merge branch 'master' into CORE-1860
removed inlined CSS as well as commented code
modified web-app/css/control.css
Merge branch 'CORE-1860' of github.com:frontlinesms/frontlinesms2 into CORE-1860
Added sortable routing List for connections
refactored js that was previously inserting inline JS to instead use class to hide
Merge branch 'master' into CORE-1814
Implemented back end for defining routing tules for fconnections
refactored showTestRouteBtn() and checkRouteStatus in grails-app/views/webconnection/_validate.gsp and added appendButton in mediumPopup.js
updated quartz2 plugin, smssync timeout reminder now works as expected
added SimpleTrigger to trigger Timeout job
The test button now reads 'Save and Test' after connection failure
Refractored Fconnection domain objects to use sendEnabled property name
Routing rules now uses devices that have sending functionality enabled