update header
Merged 'dev'.

Conflicts:
	app/base/env.js
finish header menu
Finish gui-talks-cam-293