trying to commit
Fixed sub-folder functionality of "From File System"
Merge remote-tracking branch 'origin/js'

Conflicts:
	bundles/net.jazz.sirnewton.godev/.project