welcome page changed in web.xml, added logic to index.jsp
changed welcome page in web.xml, minor logic added to index.jps
Merge branch 'master' of https://github.com/sigmarkarl/islbok

Conflicts:
	islbok/Islbok/.settings/com.google.gdt.eclipse.core.prefs
	islbok/Islbok/.settings/com.google.gwt.eclipse.core.prefs
	islbok/Islbok/war/index.jsp
	islbok/Islbok/war/top.jsp