update fw1 to v.2.5
Merge pull request #1493 from stevewithington/develop

update fw1 to v.2.5