Merge branch 'master' of https://github.com/boilingpoint/jqbdata

Conflicts:
	DataAcquisition/Ly/LyDocument.php
	DataAcquisition/Ly/LyRules.php
	DataAcquisition/Ly/LyService.php
	DataAcquisition/test.php