progress #17, need to complete Protoshares message verification
Merge remote-tracking branch 'origin/develop' into develop