Merge branches 'master' and 'development'
added copy target to build-war in build.xml to automatically copy the
warfile to the webapp dir.