Scrum1 demo changes and font awesome

This pull request incorporates the changes we want to keep from the demos/scrum1 branch. It also includes Ben's embossing changes and my font-awesome changes from earlier today.