update workspace
merge fix
add gitignore
removed dropbox api, added phpmailer