merge with 320 and ja
merge with ja
removed obsolete entry
merge with ipa320
Merge pull request #29 from ipa-fxm/groovy_dev

minor cleaning up