Merge pull request #73 from Doha2012/master

add class JavaScannerTest
small mockito fixes
small changes for test naming
minor formatting cleanup
minor naming change
add class JavaFolderSizeTest
Merge remote-tracking branch 'upstream/master'