Merge branch 'projectAdd'
added three sixty images
Merge branch 'master' into projectAdd
add or room one
fix line-of-one
update config