Merge branch 'origin/master'
Merge branch 'origin/master'
Finished location selection (except recent places).
Merge branch 'origin/dmochalov'