stay on edit meal page until firebase is updated

also, fixed up the loading indicators...a bit better, still crap
Merge branch 'dev'