Fixed scorenorm bug with windowdata caching
Merge branch 'guff' of ../JAABA_merge into guff
Merge branch 'guff' of github.com:kristinbranson/JAABA into guff