Merge pull request #1 from g-div/develop

merge the develop branch
Merge branch 'master' of github.com:g-div/berlin-opengeo into develop