Improved Merge Support

In EGit 0.8 fast-forward merging was only supported.
Now, full resolve merge support is offered via Team->Merge...