Merge pull request #3 from ipa320/groovy_dev

merging ipa320 to ipa-fmw
removed compiler warning
Merge pull request #34 from ipa-fmw/groovy_dev

removed compiler warning
update .gitignore
Merge branch 'hydro_dev' into groovy_dev

Conflicts:
	.gitignore
Merge pull request #38 from ipa-fxm/hydro_dev

Hydro Updates