Version admin 1.0
Merge origin/develop into develop