bugs fixed.
Merge branch 'master' of github.com:gxbsst/starfire

Conflicts:
	public/css/style.css
Merge branch 'master' of github.com:gxbsst/starfire

Conflicts:
	public/css/style.css