Added "email" attribute to XmlUserManager which makes testing easier
Fixed an error message in XmlUserManager to be more accurate
Added velocity-tools-2.0.jar, which is used for Reportal; also fixed an exception in Utils.java
Merge branch 'master' into branch-3