Merge branch 'hotfix/4.0.1'
updating version number
allow setting the URL for the simile painter service for map views in the django configuration
Merging hotfix/painter_proxy
Merging master into develop