MOD: fix index nav

change index nav to be fixed
MOD: solve conflict in index.js
Merge remote-tracking branch 'yuantiku/master'

Conflicts:
	public/index.js
FIX: remove useless lines
FIX: dashboard controller test
Merge pull request #84 from slycloud/master

MOD: fix index nav