Merge pull request #1 from BCcampus/master

Master
support iframe on web vs. static image in exports
support iframe on web vs. static image in exports
support iframe on web vs. static image in exports
Merge pull request #15 from JackDougherty/master

support iframe on web vs static image in exports