Nrl update

Update NRL branch with master branch and configure plupload as upload manager for NRL.