Merge pull request #2 from cogenda/master

update code
Merge pull request #3 from cogenda/master

update code
implementation of i18n
Merge branch 'master' of https://github.com/jasonsuzhou/cogenda-web into jasonsuzhou-master
Merge branch 'jasonsuzhou-master'