- fixed crash on missing icons
- proper ID resolution for secondary skills to avoid #1258

git-svn-id: https://vcmi.svn.sourceforge.net/svnroot/vcmi/trunk@3353 4dfc6b2a-8b31-0410-aa91-d6c70e3ac834