transforming .html to .jsp alogn with a dash of logic.
Merge branch 'master' of https://github.com/sigmarkarl/islbok

Conflicts:
	islbok/Islbok/war/trace.jsp
some logic for trace added