Merge branch 'hotfix/add_gitignore'
add some template
login page
Merge branch 'feature/proj_login_page'
Merge branch 'release/20141204'