removed html mockup
Merge branch 'master' into labels