switch master to jannson and add
Merge branch 'master' of github.com:jannson/asuswrt-merlin
change 2.6.36.4brcmarm to 2.6.36.4brcmarm+