some changes
fixed adminmenue bar
Merge branch 'invitation' into ci_server