web-proto initial
various bugfix
added highlighting for javadoc
web-proto initial
input pad web support
Merge branch 'web-proto' of https://github.com/iee/iee into web-proto

Conflicts:
	org.eclipse.iee.editor/.classpath
	org.eclipse.iee.editor/src/org/eclipse/iee/editor/core/pad/result/FileResultContainer.java
	org.eclipse.iee.sample.formula/src/org/eclipse/iee/sample/formula/pad/FormulaPad.java
	org.eclipse.iee.translator.antlr/src/org/eclipse/iee/translator/antlr/translator/JavaTranslator.java
	org.eclipse.iee.translator.antlr/templates/matrix.st
	org.eclipse.iee.translator.antlr/templates/variable.st
	org.eclipse.iee.web/src/org/eclipse/iee/web/Activator.java
	org.eclipse.iee.web/src/org/eclipse/iee/web/JavaLexer.g4
	org.eclipse.iee.web/src/org/eclipse/iee/web/JavaLexer.java
	org.eclipse.iee.web/src/org/eclipse/iee/web/TestServlet.java
	org.eclipse.iee.web/src/org/eclipse/iee/web/renderer/DefaultHTMLRendererContext.java
	org.eclipse.iee.web/src/org/eclipse/iee/web/renderer/DefaultResourceRendererContext.java
	org.eclipse.iee.web/src/org/eclipse/iee/web/renderer/FormulaHTMLRenderer.java
	org.eclipse.iee.web/src/org/eclipse/iee/web/renderer/IHTMLRendererContext.java
	org.eclipse.iee.web/src/org/eclipse/iee/web/ui/handlers/OpenBrowserHandler.java
Merge remote-tracking branch 'origin/master' into web-proto

Conflicts:
	org.eclipse.iee.sample.graph/src/org/eclipse/iee/sample/graph/pad/GraphComposite.java
	org.eclipse.iee.sample.graph/src/org/eclipse/iee/sample/graph/pad/GraphElementComposite.java
	org.eclipse.iee.sample.graph/src/org/eclipse/iee/sample/graph/pad/GraphElementPresenenter.java
	org.eclipse.iee.sample.graph/src/org/eclipse/iee/sample/graph/pad/GraphModelPresenter.java
	org.eclipse.iee.sample.graph/src/org/eclipse/iee/sample/graph/pad/model/GraphElement.java
	org.eclipse.iee.sample.graph/src/org/eclipse/iee/sample/graph/pad/model/GraphModel.java
introduced shared document api bundle
Graph pad web presentation
graph visual improvements
Merge remote-tracking branch 'origin/master' into web-proto

Conflicts:
	org.eclipse.iee.editor.jdt/src/org/eclipse/iee/editor/jdt/editors/ExtendedJavaEditor.java
	org.eclipse.iee.editor/META-INF/MANIFEST.MF
	org.eclipse.iee.sample.graph/META-INF/MANIFEST.MF
	org.eclipse.iee.sample.text/.project
web application and necessary refactorings
modified ignore files
Changed FileMessenger to use standard Java 7.0 filesystem watcher api
wizzard updated to support new document model
fixed file messager
added missid dependency