Merge pull request #2 from g-div/develop

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