better br parser, fixes #7081
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev

* 'dev' of github.com:nysenate/Bluebird-CRM:
  ckeditor: update justify plugin
  ckeditor: update font plugin and moonocolor skin
  additional update for ckeditor 4.2.1
  fixes #7241 export print prod bug
  Removed commented-out code.
  Added logic to check for Assembly prefixes before adding them.  Added logic to enable loadsampledata module only for training and sd99 CRM instances.