Merge branch 'master' of https://github.com/Koalab/chromesoul

Conflicts:
	lib/options.js
	lib/tab.nsui.js

lib/options.js

@@ -158,4 +158,3 @@ OptionsManager.prototype.setElemValue = function(elem, val) {
     }
 };
 
-

lib/tab.nsui.js

@@ -132,6 +132,7 @@ Tab.prototype.hide = function() {
 };
 
 Tab.prototype.show = function() {
+	this.options.restore();
     if (typeof this.showHandler !== "undefined") {
 	this.showHandler();
     }