Merge remote-tracking branch 'upstream/master' into issues/jar-files-with-directory-entries

Conflicts:
	src/com/facebook/buck/android/RobolectricTestRule.java
	src/com/facebook/buck/java/JavaTestRule.java
make tests pass after merge
Merge branch 'issues/jar-files-with-directory-entries'
Merge branch 'issues/resources-in-root-dir'

Conflicts:
	test/com/facebook/buck/java/DefaultJavaLibraryRuleTest.java