Merge branch 'prototype-1.7'

diff --cc imp/js/dimpbase.js
Simple merge

diff --cc imp/js/imp.js
Simple merge

diff --cc kronolith/js/kronolith.js
Simple merge