Updates to include support for autogen thumbnails

includes the swf update as well
Resolving merge conflict
Merge branch 'feature/EPEDEV-248' into develop