Merge remote-tracking branch 'origin/add_shapefile_support'

* origin/add_shapefile_support:
  Added shapefile reader
Making the code style consistent
Fixed some more coding style
Merge remote-tracking branch 'origin/fix_shapefile_reader_style' into next

* origin/fix_shapefile_reader_style:
  Fixed some more coding style
  Making the code style consistent