Merge branch 'master' into development
[UPDATE] minor changes and additions

add: support/element/video
enhance: proxy
Merge branch 'development'