fixed 2D version bug that broke 3D versions.
clumsy naming clash from tidy up
clumsy naming clash from tidy up
added gallery image getter/setter
Merge branch '7.x-1.x' of github.com:ZoetropeImaging/zoetrope_drupal into feature/gallery
working gallery field property with update hook etc.
Merge pull request #8 from ZoetropeImaging/feature/gallery

Feature/gallery
halfway through adding new settings for the widget - needs finishing later
added a load more lovely features
removed debug
make sure double encodes/decodes don't happen
Merge pull request #13 from ZoetropeImaging/feature/formatteroptions

Feature/formatteroptions
allow display settings to override the url too
changes for v3 code
adding alpha versions of imports - needs testing and improving
fixed merge