not done yet, app.util.include
Merge branch 'dev/master' of github.com:ConnectAi/cornerstone into dev/master

Conflicts:
	internal/util/es6-shim.ejs
	internal/util/index.js