refaktorointia ja kommentointi
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/assets/javascripts/member.js.coffee
kommentointi
Merge branch 'master' of github.com:kantoliinary/kantoliina