add border box mixin
Merge branch 'develop'