test [otf:117 wl: 2hrs]
Merge branch 'master' of https://github.com/axodemos/AxodemosTest

Conflicts:
	OnTimeAPIExample-master/WebApp/Web.config