The Scalability Patch

Fixed figures.js scalability for buttons, as well as fix a horrible
merge mistake.
Merge branch 'master' of https://github.com/Watson-Reboot-Project/Assembly-Lab