Merge origin/master

Conflicts:
	check_confirm.php
	classes/emercoin.php
	nbproject/project.properties
	nbproject/project.xml
	payment.php