20140422 upstream

Fork fixed to work with existing manage.nodebb.org site