Merge pull request #16 from bhutchinson/master

modify build file to ignore empty directories in build/tomcat when cleaning up
Merge branch 'master' of https://github.com/kuali/kfs
Merge pull request #17 from bhutchinson/master

move jsp to correct location
Merge remote-tracking branch 'upstream/master'