Merge master & themes/holo-light branches and fix some minor JS errors.

As discussed in #90