Fix war duplicates.

When developing with idea, idea copies resource files to build/classes/main and war puts those files as well as another copy of the resource files into the war.  This PR ensures there are no duplicates.
Merge branch 'eliminate-duplicates-in-war-when-build-with-idea' into development