Added comments to gles shader fix.
TextureCompositorMulti: fixed the createSamplerName call to use the correct texture coordinate name
 * added the ability to pass a database options parameter to
 * osgearth_package that is handed over to the image writer
Merge branch 'master' of https://github.com/jklimke/osgearth into osgpackage_add_db_options_for_image_writer

Conflicts:
	src/osgEarthUtil/TMSPackager.cpp
Merge pull request #245 from jklimke/osgpackage_add_db_options_for_image_writer

Osgpackage add db options for image writer
Removed check to see if the TileSource was initialized correctly in TerrainLayer::isKeyValid.  If it wasn't initialized there is a chance it is in the cache.
Modified the ModelNode annotation to use symbol's model instead of
symbol's URI if model is set
Added an option on TileSource to select the GDAL interpolation method
during reprojection : Nearest or Bilinear
Fix serialization of chroma_key filter.
HTTPClient: add some debugging support
Revisioning: fix compile warning on gcc; remove old code
TessellateOperator: expose raw tessellation functions
Fix for writing out Features as JSON.  All attributes were being dumped out as quoted strings, now they should be written out as their proper type.
Merge branch 'master' of github.com:gwaldron/osgearth
Containers: added a missing include; TileKey: added a new createNeighborKey method; MapFrame: added an L2 cache for elevation tiles.
TileModel: set up for adjacency normals
Merge pull request #248 from aurelien35/Feature_ModelNode_UseModel

Modified the ModelNode annotation to use symbol's model instead of symbol's URI if model is set
AnnotationUtils: added missing precision qualifier for GLES in the AnnotationProgram
Merge branch 'master' of github.com:gwaldron/osgearth
ShaderGenerator: install default coloring/lighting shaders by default; Update MapNode/TexComp so that the default shaders are in OVERRIDE mode and you must use PROTECTED mode to bypass them (new pattern). This simplifies the API.