set sprint to 25
Merge pull request #238 from adobe/randy/sprint-25

Set sprint to 25
rebase glenn/live-dev branch
Normalize line endings
Merge pull request #239 from adobe/randy/live-dev-rebase

Rebase glenn/live-dev branch
Merge pull request #242 from adobe/jasonsanjose/line-endings-2

Normalize line endings