added options button to popup.html
shortened time for timeout function on popup.js
Merge branch 'Exp' into Stable