finished smtp and admin page
merged files and updated smtp