ShapeRenderer refactoring, added setAutoShapeTypes, more drawing uses current type even if not ideal.

#2011
Merge remote-tracking branch 'origin/master'