merge devel
Merge branch 'master' of github.com:studio-connect/images