Added web api commands to merge a feature and resolve a conflict using a specific feature.
Add missing GeogitDataStore.dispose() method to close the repository when the store is to be discarded.
Grammar
Space instead of backtick
Merge pull request #546 from tschaub/doc-typo

Minor doc typos
Attributes no longer look for hard coded values during merge feature.
Merge remote-tracking branch 'origin/pr/545'
Add WFS integration test case to ensure commits survive app shutdown
Set the JEObjectDatabase tx durability to COMMIT_WRITE_NO_SYNC.

With this setting db commits will survive application crashes,
though may not survive operating system crashes
Merge pull request #552 from groldan/issue_544

Make sure BEB JE commits survive application crashes and the datastore properly closes the repository
Wire up blueprints graph database to the cli injector.
Merge pull request #553 from jdgarrett/use-blueprints

Wire up blueprints graph database to the cli injector.
Use the blueprints graph database in the web app.