Small models update
Small merge
Merge branch 'java5' of http://github.com/NetLogo/NetLogo into java5