merge master
merge master

NewEconomyMovement/NemCommunityClient,NewEconomyMovement/NemCommunityClient,NewEconomyMovement/NemCommunityClient,NewEconomyMovement/NemCommunityClient,NewEconomyMovement/NemCommunityClient,NewEconomyMovement/NemCommunityClient