Bug fixes.
Merge branch 'master' of https://github.com/arirahikkala/tulkoonvalo

Conflicts:
	server2/index.php