adding data-filename for future use and api-based uploads
synced with upstream
resolved merge conflicts
Prevent default drop event when disableDragAndDrop is true. #531.
Fix typo on comment
merging upstream
restoring fontawesome, as shown on their site, to avoid duplicate directories
Merge pull request #478 from drewcovi/master

Add data-filename attribute to images
Fix clearning file input on image dialog
#548 added wrapper div around image upload field
- Fixed AirMode popup so that it disappears when you click on "Help"
  or the Link, Image, or Video insert buttons.
- Fixed the link editor popup so that it disappears when you click on
  the edit icon.
Merge branch 'master' into develop
Merge pull request #541 from HackerWins/fix-clearning-file-input

Fix clearning file input on image dialog
Merge branch 'master' into develop
Update index.html

added missing </span>
Merge pull request #554 from daslicht/patch-1

Update index.html
Fix for missing specificity for columns as done with headings and other elements.
Merge pull request #557 from godaddy/column-specificity-fix

Fix for missing specificity for columns as done with headings and other ...
implement insertParagraph (<p>).
Merge pull request #549 from rwhitmire/master

#548 added wrapper div around image upload field