Merge pull request #2 from Slurps/master

Luokkakaavion luokat ja IDluettelo
Merge pull request #1 from psyk1s/master

Antonin pull request kokeilu maanantaina 19:38
Added fullscreen_activity.xml
Merge pull request #3 from psyk1s/petridev

Added fullscreen_activity.xml
Kuvat

partsit ja techit
Lauta

Koko lauta ja lauta osissa.
Created bar for resources

Created the outline for resources bar on GUI and defined some strings
and colors.
Diplomat ja reputation -tilet
Merge pull request #4 from antohagg/master

tilet ja laudan osat
Edited sizes of resource bar items
Added getters to Player.java
Merge pull request #5 from psyk1s/petridev

Petridev
Merge pull request #2 from psyk1s/master

Kuvat yms