Merge branch 'master' of https://github.com/opennetworkinglab/ONLabTest into FuncPlatform

Pulling changes from master before issuing pull request