Proper use of jQuery prop vs attr
Merge branch 'checkbox' of git://github.com/bp323/3akai-ux into checkbox
Merge remote-tracking branch 'origin/newframework' into accountpreferences