nav view page update
usercontroller & encrypt update
Merge branch 'Unho' into dev