change it to run with newer version of jetty
Merge branch 'hotfix_1.4.3' into develop
Merge branch 'hotfix_1.4.4' into develop
add twilio open question (with audio)
Merge branch 'develop' of https://github.com/almende/dialog into develop
bug fixes in unit tests
Add use external number property for referral
Add new media property for pre-connect message (not implemented)
Updated changelog
Update DDR records for referred calls
first version of preconnect (untested)
fix: renamed variable (was not found).
Merge branch 'hotfix_1.4.5' into develop

Conflicts:
	dialoghandler/src/main/java/com/almende/dialog/adapter/TwilioAdapter.java
Merge branch 'hotfix_1.4.6' into develop
fix: return application/xml for twilio endpoints
Merge branch 'release_1.5.0' into develop

Conflicts:
	dialoghandler/changelog.txt
	dialoghandler/src/main/java/com/almende/dialog/adapter/TwilioAdapter.java
fix: inbound issues with twilio adapters. fixed dot chars in ddrRecords
fix: call reject options in twilio
Merge branch 'develop'

Conflicts:
	dialoghandler/changelog.txt