Merge pull request #1338 from stude1/master

Proposal from Julius Manni for Helsinki 2014
Merge pull request #1339 from stude1/master

Fix to Julius Manni's proposal
Update bio for Manni

New bio from himself.
Merge pull request #1340 from jyrkiput/update-bio

Update bio for Manni
Changed hours & info