Merge branch 'development'
Merge branch 'development'
Ensured that JS cycle is only executed when ther are more than one image
Merge branch 'master' into development