edit timeout
fix presence
Merge branch 'develop' into gh-pages