added some meta tags
Merge branches 'master' and 'dev'