Updated buildscripts; removed [test?] dependency
Updated these stupid spring stuff
More test exclusions due to XServer requirement
Merge branch 'spring2tree'