Merge branch 'develop' into delrifai/#621_add_proposal_votes_accountmaincard