Simplified interface and integrated nutella
Merge branch 'master' of https://github.com/nutella-framework/basic-web-interface

Conflicts:
	nutella.json