Added java file parsing
Merge remote-tracking branch 'origin/master'

Conflicts:
	generation/src/main/scala/Runner.scala