added magazine.bib
added magazine pub category
Merge branch 'master' of github.com:istlab/web