interfface
Merge remote-tracking branch 'origin/dev_zerocity' into leo

Conflicts:
	app/views/main.html
nav animation
add hide function
Merge remote-tracking branch 'origin/leo' into dev_zerocity
add codemirrow