Remove app directory before deploying war.

If you don't remove the app directory, tomcat won't overwrite it. I observed
this on 2 machines where the war file was dated 7/14/14 but the directory and
its class files were dated 7/10/14.
Merge branch 'master' into events