Added code to make skills more than 5 display ellipsis
Fixed conflicts with latest master
Merge pull request #185 from Webcraft-Myplanet/UF-233

Added code to make skills more than 5 display ellipsis