Merge pull request #14 from Eorling/dev

Dev
mailer.php modified
refactored main.php and webuser
com1
conf resolve
refactoring
refactoring