mysql cleanup
switch to origin/unstable
fix heroku editable fields