Rename Progress to ProgressDisplay to avoid a naming conflict.
Merge branch 'master' of https://github.com/MarimerLLC/csla