Proper content attribute in meta
Merge branch 'master' into develop
Fix haml markup errors
Merge branch 'develop'