Merge remote-tracking branch 'upstream/master'
Cleaned up spacing. Added a few wrapper functions
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into jtscala
Finished implementing intersection, union, and difference for point, line, polygon, point set, line set, and polygon set.
Move companinon objects above classes for point, line, polygon
removed random keystroke error in PointSet.scala
Merge pull request #734 from BrandonNoad/jtscala

Adding implementations for intersection, union, and difference in /feature for JTS wrapper
Merge remote-tracking branch 'upstream/master' into feature/fileupload