some jquery
merge
login working again