included location in plan view
Merge branch 'development'