Merge HTML5 improvement and WAI-ARIA support #1819
Merge branch 'develop' into feature/job_src
Remove unneccessary changes