Merge branch 'master' into develop
Adding rounded corners and header bottom border
Separating right side bar boxes
Merge branch 'develop'