Merge remote-tracking branch 'upstream/master' into issues/resources-in-root-dir
handle resources in the root folder
support for running junit tests from the root directory of the module instead of the project root
add directory entries to jar files
directory should have a trailing slash
Merge branch 'master' of github.com:mread/buck

Conflicts:
	src/com/facebook/buck/java/JavaTestRule.java