Merge remote-tracking branch 'origin/addrindex'
Added comments
Merge branch 'auxpow' merged mining

This merge enables merged mining on testnet
Remove unused methods
Merge remote-tracking branch 'origin/cleanup'