Merge pull request #12 from gelnicproduction/master

testing_upgrade_server renewed