Create and implement the 'edit content' widget
Merge remote-tracking branch 'origin/newframework' into editcontent
Follow up on 'edit content' review
Merge remote-tracking branch 'origin/newframework' into editcontent
Follow up on edit content widget review
Merge branch 'editcontent' of git://github.com/bp323/3akai-ux into editcontent
Minor `Edit Content` follow-up
Merge origin/newframework and fix conflicts