copy java resources into war file.
Merge remote-tracking branch 'remotes/astamuse/develop' into develop