Removed dependancy of resources from model by pathing them through view -> game -> map
small changes in provinceView and abstractView
Merge branch 'buttons' into develop
fixing som graphical problems
problem solving
from friday, working with mobileverison
fix reall wierd problem
Merge branch 'buttons' into develop
conflict..
Merge branch 'develop' of https://github.com/Bergmam/DAT255 into develop
Merge branch 'master' of https://github.com/Bergmam/DAT255 into develop
some text placement changes
added some behavior
Merge branch 'placement' into develop
Zooming for desktop implemented
Merge branch 'mybranch' into develop
popup
added 3 cards
added 3 more cards
added JokerCards