add env workaround
update tests
Merge branch 'origin/feature-app-refactor-structure'

Conflicts:
	app/base/main.js