login fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/bbf-style.css
	css/bbf-style.css.map
change css