Merge branch 'origin/master'
BugFix: wrong OR operator (bitwise instead of logical)
code cleanup: var is already a jQuery object
BugFix: Firefox changes color of selected option on select, so the css-color hack does not work. Instead the color is saved inside a data-attribute now.
Merge branch 'shapeChanging'