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

Pull request according to [issue #90](https://github.com/jaunesarmiento/fries/issues/90)