lang in index.jade for en-us should be 'en' from now on.
Merge branch 'develop'