Commit
Merge remote-tracking branch 'origin/master'
Ivan's changes
Merge remote-tracking branch 'origin/master'
Change UI
Merge remote-tracking branch 'origin/master'