Merge pull request #319 from yinjimmy/develop
update welcome app