Added failing tests for CORE-1677
Added failing tests for CORE-1676
Implemented UI for testing routes
CORE-1292 tests
CORE-1292 test modification
Testing a web connection is working
Fixed failing tests for testing a web connection
Merge branch 'master' into CORE-1489

Conflicts:
	plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy
	plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy
	plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy
	plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp
	plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy
	plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy
	plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy
Autoforward refactoring and webconnection fixes
Fixed failing WebconnectionControllerISpec tests
Merge branch 'master' into CORE-1489

Conflicts:
	plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy
	plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy
	plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp
	plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy
time stamp change in appilcation.properties
Merge branch 'master' into CORE-1489

Conflicts:
	plugins/frontlinesms-core/application.properties
	plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy
	plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp
Cleaned up connection UI and ConnectionFSpec.
Merge branch 'master' of github.com:frontlinesms/frontlinesms2

Conflicts:
	plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp
Removed Ignore from FmessageISpec
Fixed mistaken merge of ActivityController when merging Webconnection testing.
Fix IE magic wand bug
Disable magicwand init for IE users.
Merge branch 'core-2.x' of git://github.com/frontlinesms/frontlinesms2 into core-2.x
Fix JSLint warning
'else after return'.