Changed output to NAF format.
Merge branch 'master' of github.com:ixa-ehu/ixa-pipe-parse

Conflicts:
	src/main/java/ixa/pipe/parse/Annotate.java