Fix error when deleting content comment
Merge branch 'deleteComment' of git://github.com/bp323/3akai-ux into deleteComment
Merge remote-tracking branch 'origin/newframework' into accountpreferences
Follow-up on accountpreferences widget