fixed bug
fixed bug
Merge branch 'master' into develop

Conflicts:
	test/debugchannel/DebugChannelTest.php
updated git ignore
updated docs to include info on global functions
fixed typo in docs
fixed typo in docs
added dc_setup.json example to docs
updated docs
Merge branch 'develop'