Bug fix in parse
Merge branch 'common_dev'

Conflicts:
	src/main/java/ixa/kaflib/Tree.java