Lisatty palautaTutkintoPisteet
Merge remote-tracking branch 'mahevi/master'
Merge remote-tracking branch 'upstream/master'
Virheet korjattu
Merge remote-tracking branch 'tssela/master'
Merge remote-tracking branch 'mahevi/master'

Conflicts:
	suoritukset/app/model/Kandikurssi.js
	suoritukset/app/store/Kandikurssit.js
opintopisteet()