float is reserved - use cssFloat instead
Fix undefined variable
js cleanups
js cleanups
Merge branch 'master' into imp_6_1