Primecoin: Merge with Bitcoin v0.8.5

Conflicts:
	bitcoin-qt.pro
	doc/README.md
	doc/README_windows.txt
	share/setup.nsi
	src/checkpoints.cpp