- create branch
Merge origin/Release-Note_view into Release_finish_admin_view
- Finishing some features
Merge commit '5f6ad4b37ba994428edc0d9a29848a1c11904037' into Release-Note_view