Feature 2 created
Merge branch 'develop' of https://github.com/baffled/geoflow into feature_2
Merge branch 'feature_2' into develop