changes to elements.html
Merge branch 'refs/heads/master' into devLocal