Merge branch 'develop' into feature/individualPageTemplete
complete navigation bar
set navigation bar
Merge branch 'feature/individualPageTemplete' into develop
work -> works