04_06_13_1
04_06_13_2
Merge branch 'development' of github.com:imagecms/ImageCMS into development