Add template tabview
Merge commit '0c4d35b505c0ef2bc035941f629af3e1fb6a8e04' into masterRemote