Added javadocs
Merge branch 'development' into filetask
Catches FileNotFoundException