Wallet update 2.1.1.2

2.1.1.2 mandatory update before block 318000
Merge branch 'master' of https://github.com/microcoinsource/microcoin

Conflicts:
	src/main.cpp