Merge branch 'master' of github.com:imagecms/ImageCMS into template
wish_list
merg
auth api fixes
merge commit
view
merg
merg
Merge remote-tracking branch 'origin/template'