fix ast
Merge branch 'master' of github.com:konoha-project/KonohaCoffee

Conflicts:
	src/org/KonohaScript/SyntaxTree/BoxNode.java
	src/org/KonohaScript/SyntaxTree/DefineNode.java
update KonohaVM
Merge branch 'master' of github.com:konoha-project/KonohaCoffee

Conflicts:
	src/org/KonohaScript/SyntaxTree/BlockNode.java
	src/org/KonohaScript/SyntaxTree/BoxNode.java
	src/org/KonohaScript/SyntaxTree/DefineNode.java
	src/org/KonohaScript/SyntaxTree/NodeVisitor.java
Merge branch 'master' of github.com:konoha-project/KonohaCoffee
adding modification of build.xml
replacing KNameSpace with KonohaNameSpace
Merge commit 'ef6e67c8d2ab6dd316126202f7e3960a902b1f71'
fix conflict