Add in a global "netbeans.hint.deploy.server" setting which tells NetBeans to use the "Tomcat" server for deploys.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of git://github.com/DSpace/DSpace
Reverting commit that added 'netbeans.hint.deploy.server' to DSpace pom.xml. It's unnecessary, as this Netbeans-specific setting can instead be stored in a user's ~/.m2/settings.xml file.
Merge remote-tracking branch 'upstream/master'
Single Item Filtering corrected.
GetRecord bug solved
Version 2.2.4 of XOAI integrated.
New catch (Exception)
Using version 2.2.5 of XOAI
XOAI configuration directory moved
License headers!
[DS-1272] Setting discovery to be the default search/browse engine
mobile theme: CSS fixes
fix a bunch of typos
Merge remote-tracking branch 'upstream/master'
Fix for DS-1198 on latest master
Bumping performance constraints in test suite in order to cut the DSpace 3.0 RC1 release; performance degradation discussions to commence on list.
Merge pull request #30 from tdonohue/DS-1198

DS-1198 : Fix for "Unit Testing Framework fails to initialize properly on Windows OS"
Adding updated PDF documentation for 3.0-RC1