Merge branch 'develop' of github.com:Cbsoftware/pressureNET-server into develop
Merge branch 'master' into develop
Removed image_thumbnail and image_blurred from blog post
Merge branch 'web' into develop