changed glyphoicons in skills to numbers 1- 10
Fixed conflicts
Merge pull request #202 from Webcraft-Myplanet/UF-356

UF-356
Merge with latest master