Merge pull request #106 from ohtu2014-halme/devel

Devel
Merge pull request #110 from ohtu2014-halme/devel

Devel
Merge pull request #119 from ohtu2014-halme/devel

Devel
admin on suomeksi ylläpitäjä
Merge remote-tracking branch 'upstream/master'
websiten ohje
Merge remote-tracking branch 'upstream/devel'
jotai
jotain taas
Merge remote-tracking branch 'upstream/devel'
Merge pull request #120 from nsikkila/master

dgf