will keep using the older version of scriptaculous for now
Some temporary fixes
Merge commit '8163c56'

Conflicts:
	MIT-LICENSE
	controls.js