Merge pull request #544 from liuchuangww/user

User
Move custom template file to custom directory