Merge pull request #9 from lamuertepeluda/master

Move ui experimental code as base for the master base (JI: APPWTV-10)

Jira-issue: APPWTV-10