fix font awesome
Merge branch 'fix-demos' into testing
fix cnx demo popover/overlay plugin usage
Merge branch 'testing' of github.com:oerpub/Aloha-Editor into testing
Merge branch 'oerpub-ticket428' into testing