CMS-1577 Live Edit:Context window - implement basic framework prototype
- minor refactoring and styling
CMS-1644: 5.0: Upgrade Font Awesome to version 3.1.1
Merge remote-tracking branch 'origin/master'