remove some obsolete methods from the @JsonProvider@ interface
Merge pull request #46 from jochenberger/cleanup-json-provider

remove some obsolete methods from the @JsonProvider@ interface
Removed MERGE_MULTI_PROP option (not part of spec).
Configured Heroku deploy
Fixed main class in pom.
Updated Heroku java version.
Updated Heroku to load resourceBase from file.
Fixed Heroku proc file.
merge JsonProvider's getMapValue methods, various small performance improvements
Merge pull request #47 from jochenberger/merge-get-map-value-methods

merge JsonProvider's getMapValue methods, various small performance improvements
Renamed FilterPathToken to PredicatePathToken
Merge remote-tracking branch 'upstream/master'