Merge branch 'develop'
change layout
remove active menu
Merge branch 'master' of gitcafe.com:oscnet/pjhrss into develop