salasanan vahvistus hallinta sivulle
Merge branch 'master' of https://github.com/kantoliinary/kantoliina

Conflicts:
	app/views/accountcontrol/index.html.haml
Merge branch 'master' of https://github.com/kantoliinary/kantoliina