Test change
Ignore for admin web class
Merge pull request #7 from p-gintare/tool-editor

Test and ignore
added tool interface with one add button which adds parameter
Merge pull request #8 from p-gintare/tool-editor

added tool interface with one add button which adds parameter
Added table examples
Added simple list tool editor example
changed interface using simple-list.txt
new design two choices just for showing how it can look like
Merge pull request #9 from p-gintare/tool-editor

Tool editor
Line break fix
Merge branch 'tool-editor' of https://github.com/chipster/chipster.git
into tool-editor

Conflicts:
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/BasicModel.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Input.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Output.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Parameter.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Tool.java
added update button which takes tool from text area and adds to tool ui.
Merge branch 'tool-editor' of https://github.com/p-gintare/chipster into tool-editor

Conflicts:
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/BasicModel.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Input.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Output.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Parameter.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Tool.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/tooledit/TextEditor.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/tooledit/ToolEditor.java
Fix missing import, java version to 1.7, class files to ignore
Merge branch 'master' into tool-editor

Conflicts:
	src/main/admin/admin-web/.gitignore
	src/main/web/tool-editor/src/fi/csc/chipster/web/list/Type.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/BasicModel.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Input.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Output.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Parameter.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/model/Tool.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/tooledit/TextEditor.java
	src/main/web/tool-editor/src/fi/csc/chipster/web/tooledit/ToolEditor.java