Add javadoc and remove whitespace.
Fix rendering of container.
Fix display of selected import location.
Merge pull request #1702 from jburel/folder-name-import

Folder name import