fixing strict issue in protected
Merge branch 'master' into mobile
starting on "modals" and fixing some header menu crap
modal fix, header logo fix, note edit bs