Merge branch 'develop' of http://github.com/eu-osha/osha-website into develop
Merge branch 'develop' of http://github.com/eu-osha/osha-website into develop
refs #2700: added images.txt migration
refs #2700: added migration in install and update
refs #2700 - added source and destination fields
refs #2700 - added tests for images
Merged and fix conflict pull req #111
Merge branch 'eugenst-2700_migrate_images' into develop