spinner and dialog stuff
Merge remote-tracking branch 'origin/master'
bla bla bla