Merge branch 'master' into develop
upgraded jsoup html parser to 1.8.1
Merge branch 'develop'