upravy
Merge branch 'master' of https://github.com/fancystudio/bitcoin

Conflicts:
	plugins/function.sposob_platby.php
uprava sposob platby