Merge branch 'master' of https://github.com/garethrylance/FreeswitchTesting

Conflicts:
	README.md