add border to rect
Merge branch 'development'