just updating index.jsp first...
Merge branch 'develop' of github.com:ewpatton/SemantEco into develop

Conflicts:
	facets/annotator/src/main/resources/META-INF/res/index.jsp
adding file link lightbox