add ajax frame
Merge branch 'master' of https://github.com/emoney86/MiniMail
fix merge conflict
Merge branch 'create_forms_user_forms_login' of https://github.com/emoney86/MiniMail
every branch added to master