adding data-filename for future use and api-based uploads
synced with upstream
resolved merge conflicts
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