amber_gold
Merge branch 'master' of https://github.com/ambercoin/ambercoin

Conflicts:
	Makefile