small helper fix
Merge branch 'master' of https://github.com/markddavidoff/strategystroller
updated update panels
fixed merge conflicts between priyaFix and master