Merge tool editor war
Use standard VaadinServlet in admin web
Merge branch 'master' of https://github.com/chipster/chipster.git

Conflicts:
	src/main/resources/build.number
Tool editor fixes.
Merge branch 'master' of https://github.com/chipster/chipster.git