Add atlas app
Merge branch 'origin/master'
Merge branch 'origin/atlas_robot'