modified save & test button layout on webconnection wizard
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
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
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
Merged latest master; minor refactor to names of routing appSettings; added hidden field to track sort order.
Cleaned up CSS/layout of checkboxes in routing rules lists.
Fixed failing SettingsController tests
Test fixes
More test fixes
Fixed broken tests
Merge branch 'master' into CORE-1695

Conflicts:
	plugins/frontlinesms-core/application.properties
	plugins/frontlinesms-core/do/js_unit_test_xml
	plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy
	plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy
	plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy
	plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy
	plugins/frontlinesms-core/web-app/css/wizard.css
[CORE-1870]Refactored Webconnection validate js into its own file
Merge branch 'master' into CORE-1860

Conflicts:
	plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp