Merge pull request #170 from burstly/dev

Dev
Added border to expandables
Merge pull request #171 from burstly/master

Added border to expandables