update fotorama to latest
Merge branch 'bug/update-fotorama' into dev

Conflicts:
	admin/assets/js/generator.js.map
	admin/assets/js/generator.min.js
recompile from merge