switched to JDK7 cause have much trouble with 6
oops, merge master crushed
added support for text in brackets and for '...'
Merge remote-tracking branch 'origin/master' into JDK7

Conflicts:
	.idea/workspace.xml
	src/main/java/FileParser.java
	src/main/java/Parser.java
	src/main/scala/OpenCorpaToSentenceConverter.scala