Merge pull request #126 from stjantti/DanielBranch

Daniel branch
Merge pull request #127 from stjantti/DanielBranch

Loput dialogittehty loppuun
Merge pull request #128 from stjantti/DanielBranch

Korjauksia koodiin
Merge pull request #129 from stjantti/DanielBranch

Daniel branch
Merge pull request #130 from stjantti/DanielBranch

Korjattu osan bugeista
Merge pull request #131 from stjantti/master

Pivitän muutoksia itselleni