merge
Merge branch 'master' of github.com:JetMuffin/PicServer

Conflicts:
	src/com/picserver/hbase/HbaseMatching.java
Merge branch 'master' of github.com:JetMuffin/PicServer
Merge branch 'master' of github.com:JetMuffin/PicServer
Merge branch 'master' of github.com:JetMuffin/PicServer
Merge branch 'master' of github.com:JetMuffin/PicServer
merge
Merge branch 'master' of github.com:JetMuffin/PicServer
一个小bug