Added refactoring (Issue #7)
Issue #7 - putting cursor thenReturn(-->here<--)
Merge branch 'convert_to_when_return'
Updated configuration
Merge branch 'master' of
https://github.com/michalborek/mockito-eclipse-tools

Conflicts:
	pl.greenpath.eclipse.updatesite/.gitignore
	plugins/pl.greenpath.mockito.ide.refactoring/META-INF/MANIFEST.MF
	plugins/pl.greenpath.mockito.ide.refactoring/src/pl/greenpath/mockito/ide/refactoring/proposal/ConvertToFieldMockProposal.java
	plugins/pl.greenpath.mockito.ide.refactoring/src/pl/greenpath/mockito/ide/refactoring/quickfix/MocksQuickFixProcessor.java