fix style and db issue
Cut down description #28
Merge branch 'dev'

Conflicts:
	views/components/header.jade