adding alpha6-dev version of geofield to resolve errors from diff of local and all modules
Merge branch 'master' into test