Merging...
Merge branch 'master' of https://github.com/ckubacak/piLab

Conflicts:
	register.php
	translations/register