[MRM-1407] documentation for staging & merging repositories submitted by Patti Arachchige Eshan Sudharaka additional changes made: o moved to staging repos doc to admin guide instead of user guide o added a few lines and fixed typos in the staging doc
archiva/branches/archiva-MRM-980/archiva-docs/src/site/apt/adminguide/configuration.apt
archiva/branches/archiva-MRM-980/archiva-docs/src/site/resources/images/conflicting-artifacts.png
archiva/branches/archiva-MRM-980/archiva-docs/src/site/resources/images/repository-merge.png
