Merge Commit
clean conflict Testing.view.html in odata.