added semantic markup icon; fixed outputPresenters to show actually used
path for outputs of semantic markup / matrix generation;
Merge branch 'master' of https://github.com/biosemantics/etcSite.git

Conflicts:
	src/edu/arizona/sirls/etc/site/server/rpc/MatrixGenerationService.java
	src/edu/arizona/sirls/etc/site/server/rpc/SemanticMarkupService.java