Merge branch 'master' into development
Aug 23 version
Fix bugs
Add ta emails
Merge branch 'development'