Merge branch 'pre_release_0.6.0' into develop
Merge branch 'pre_release_0.6.0' into develop
Merge branch 'hotfix_0.6.1' into develop

Conflicts:
	Charlotte - Java dialog tooling/changelog.txt
	Charlotte - Java dialog
tooling/src/com/almende/dialog/adapter/tools/Broadsoft.java
hotfix for adding dtmf value in the answer payload
updated changelog
Merge branch 'hotfix_0.6.2'

Conflicts:
	Charlotte - Java dialog tooling/changelog.txt