Merge branch 'master' of github.com:chandlerzhang/fzy

Conflicts:
	FzyRest/pom.xml
1