first test of merged mining patch

Conflicts:
	bytecoin-qt.pro
	contrib/merged-mine-proxy
	src/auxpow.cpp
	src/auxpow.h
	src/bytecoinrpc.cpp
	src/bytecoinrpc.h
	src/main.cpp
	src/main.h
	src/rpcblockchain.cpp
	src/rpcmining.cpp

	modified:   bytecoin-qt.pro
	modified:   contrib/merged-mine-proxy
	modified:   src/auxpow.cpp
	modified:   src/auxpow.h
	modified:   src/bytecoinrpc.cpp
	modified:   src/bytecoinrpc.h
	modified:   src/db.cpp
	modified:   src/main.cpp
	modified:   src/main.h
	modified:   src/makefile.unix
	modified:   src/rpcblockchain.cpp
	modified:   src/rpcmining.cpp
	modified:   src/txdb.cpp
first test of merged mining patch

Conflicts:
	bytecoin-qt.pro
	contrib/merged-mine-proxy
	src/auxpow.cpp
	src/auxpow.h
	src/bytecoinrpc.cpp
	src/bytecoinrpc.h
	src/main.cpp
	src/main.h
	src/rpcblockchain.cpp
	src/rpcmining.cpp
first test of merged mining patch