morning changes
Merge remote-tracking branch 'upstream/master'
moved toolkit to public
w changed image loading