Fixed w3c validation errors
Merge branch 'develop'