merged with trunk
update after merge
Merge branch 'master' of https://github.com/cagarvie/CAG.git

Conflicts:
	src/main/java/PlayProject/CAG/class1.java