2014.6.5
Merge branch 'master' of https://github.com/qingyu1229/beyond-spider.git

Conflicts:
	beyond-spider/src/test/java/com/beyond/test/HY88.java

Signed-off-by: Administrator <Administrator@JSUASN8MMKJNVH8>