disallowed to select system folders (Root, 'Owned', and 'Shared') as
input folder for any task. 
disallowed to use an empty folder as input folder for any task.
added etc-overview.png
trying to merge with remote
trying to merge with remote
try to merge with remote
Merge branch 'master' of https://github.com/biosemantics/etc-site.git

Conflicts:
	src/main/java/edu/arizona/biosemantics/etcsite/server/rpc/semanticmarkup/InJvmLearn.java
	src/main/java/edu/arizona/biosemantics/etcsite/server/rpc/semanticmarkup/InJvmParse.java
	src/main/resources/edu/arizona/biosemantics/etcsite/server/rpc/io/semanticMarkupInput.xsd
	src/main/resources/edu/arizona/biosemantics/etcsite/server/rpc/io/semanticMarkupOutput.xsd
	src/main/resources/log4j.properties.loc