huge merge

added login & portal stable tested by @dilaozcelik