Updated storyboard to have button for admin fix
Merge remote-tracking branch 'origin/master' into bw
change status colors
add fix button
merge from master
pop messages upon clicking Fix