Create and implement the 'edit profile' widget
Merge origin/master and fix conflicts
Follow up on edit profile review
Merge branch 'editProfile' of git://github.com/bp323/3akai-ux into editProfile
Edit profile follow-up
Merge branch 'editProfile'