Add UserActivity
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-02
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-02
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-02