Merge branch 'master': Fixed merge.

util.js was not merged correctly in the previous commit. planner.html was missing modal.js.