change
Merge branch 'master' of https://github.com/flashsword20/imcaptcha

Conflicts:
	src/main/java/com/dianping/imcaptcha/action/ValidateAction.java
	src/main/java/com/dianping/imcaptcha/strategy/WaveFilter.java