changed FileService for incompatibility with JDK1.6
Merge remote-tracking branch 'origin/master'
Added Javadocs comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Start.java