Added box-rounded mixin
Merge