upgraded bootstrap
added ellipsis capabilities
added ellipsis capabilities
added ellipsis capabilities
Merge origin/master