Fix #24
Merge branch 'develop' of github.com:loganalysis/geonode into develop