added cockpit to grund deploy task
update header
clear env.js
add cockpit-deploy to dev-deploy
add clear-dist workaround for env.js
Merged 'dev'.

Conflicts:
	app/base/env.js