13_05_2013_1
Merge branch 'webinger' of github.com:imagecms/ImageCMS into webinger