clear env.js
Merged 'dev'.

Conflicts:
	app/base/env.js