add env workaround
add readme
Merged 'dev'.

Conflicts:
	README.md
	app/base/env.js
	app/js/base/app.js
	app/js/base/main.js