Merge branch 'master' into fire
Merge branch 'explorer' into fire
* implemented new animation system
* fixed cardgame compilation issues