Initial commit for new branch
junit tests added, small changes in code
swing interface added
file manager was finished
Merge branch 'featureBranch'