import&exchange&\kill
Merge branch 'master' of github.com:imagecms/ImageCMS into development
logo.png
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/development'