Merge branch 'dev', remote-tracking branch 'origin'
Language change
Merge branch 'dev' of github.com:demersdesigns/ds_landing into dev