Merge branch 'uemeettttttttttt' into buble

Conflicts:
	Nowy1.php