by mary
verifier renew
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/nihongo/chiisaidb/planner/data/QueryData.java
	target/classes/nihongo/chiisaidb/planner/Parser.class
	target/classes/nihongo/chiisaidb/planner/data/QueryData.class
	target/classes/nihongo/chiisaidb/predicate/Predicate.class
	target/classes/nihongo/chiisaidb/predicate/Term.class