Added a rule to the makefile to create java keystore files that end in
.jks
Added Javascript and CSS file types.
Merge branch 'master' into dev
Changed policy file.
Merge branch 'master' into dev
Merge branch 'dev' of workvm:~/src/GenericServer into dev