Merge branch 'dev' of github.com:wysiwhat/Aloha-Editor into dev
Merge branch 'ticket243' into dev
ticket 273: don't override the default behaviour of the em tag.  we want em elements to be italicized.
Merge branch 'dev' of github.com:wysiwhat/Aloha-Editor into dev
Merge branch 'issue273' into dev