Uutta committia, logini toimii
Uutta committia
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes/config.php