Merge pull request #603 from raistlinthewiz/develop

sync develop with master
Merge pull request #606 from raistlinthewiz/develop

fixed #604.
Update gettingstarted.rst
Merge branch 'develop' of github.com:CoiniumServ/CoiniumServ into feature/markets