client detection
fixed conflict
Merge branch 'headermenu' of github.com:inepex/ineform into headermenu
alias modes on the drawer
alias modes on the drawer
Merge branch 'headermenu' of github.com:inepex/ineform into headermenu