2.5.0-dev
Add README section on using your own proxy server
Use double quotes in README code samples
Merge remote-tracking branch 'origin/QA_2_4' into develop

Conflicts:
	CHANGELOG
	codebird.js