jade -> ect -> marko
increased modularity with marko
tidy
Merge branch 'master' of https://github.com/jlarsson/lwis

Conflicts:
	config/default.json