Resolved
Merge branch 'master' of github.com:gaiax-asia/201412_activity