Fixed issue when adding a conflicted feature if no unstaged features existed.

Improved testing for conflict storage has been added
Merge branch 'master' of github.com:opengeo/GeoGit