working on buttons. almost done
fixed conflicts in scripts_base.js
Merge branch 'activedev' of https://github.com/WheatonCS/Lexos into activedev