Adds upload of geoJSON file functionality, and Database Cleaner to Cucumber tests
minor merge conflict fixed