Commit for Merge
Merge branch 'master' of https://github.com/plovesm/PicSorter.git

Conflicts:
	src/com/tallkids/picsorter/ui/DirectorySelectionFrame.java
	src/com/tallkids/picsorter/ui/TestFrame.java