Added Miika Puputti to Copyright
Merge branch 'master' into Frantic