Merge pull request #3 from chrshffmn/master

bampfa-155-d merging in changes for doc searching
BAMPFA-134 modified image urls so images would display in the embedded tomcat
BAMPFA-135 converted charset to UTF8 for all jspf files