re-apply changes from modified SVN checkout
take up POM fixes for move to GitHub
Externalize locality name data or get them from Java.
[DS-1156] Factor out Browse related code from InitializeDatabase into InitializeBrowseDatabase.
Merge branch 'master' of git@github.com:DSpace/DSpace.git into testing-env
Merge pull request #7 from robintaylor/master

[DS-1156] Refactor Browse related code out of InitializeDatabase into InitializeBrowseDatabase
Catch up with current stock.
Merge remote branch 'stock/master' into testing-env

Conflicts:
	dspace-api/src/test/resources/dspace-test.cfg
	dspace-api/src/test/resources/dspaceFolder/config/dspace.cfg
	dspace-api/src/test/resources/dspaceFolder/config/input-forms.xml
	dspace-api/src/test/resources/dspaceFolder/config/item-submission.xml
	dspace-api/src/test/resources/dspaceFolder/config/modules/authentication-shibboleth.cfg
	dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/schema.xml
Use released version of FileWeaver, remove snapshot repo. declaration
[DS-1160] - Refactor InitializeDatabase to use Configuration Service rather than ConfigurationManager
[DS1160] - Remove now redundant import of ConfigurationManager
DS-1072 Post-registration link has a blank href if hosting DSpace at root instead of at /xmlui
PDF generation is not consistent to the expected filename so try other versions of filename
DS-1072 also fix on return from forgot password
DS-1072 also fix on return from forgot password
Merge branch 'master' of github.com:LongsightGroup/DSpace
Merge pull request #10 from LongsightGroup/master

DS-1072 Post-registration link has a blank href if hosting DSpace at root instead of at /xmlui
Merge pull request #8 from mwoodiupui/testing-env

[DS-859] Packaged testing environment:  begin using the package
[DS-981] API Project and build assembly restructure
Generate the test environment early enough for 'mvn test' to use it.

'package' comes after 'test', so the .zip was not being created or
attached.  If the archive was not available from a repository, the
'test' phase would not find it and would fail.

Treat the .zip as a test resource and create it in 'generate-test-resources'.
Merge pull request #9 from robintaylor/DS-1160

[DS-1160] - Refactor InitializeDatabase to use Configuration Service rather than Configurationmanager...