Merge pull request #376 from fablife/master

Closes gh-279
closes issue gh-278
public uploads admin preference. closes gh-371
Reverted json/xml formatting to initial state before issue 278 as per request by Tom
Merge remote-tracking branch 'fablife/skillbank_reqs' into gh-278
Merge remote-tracking branch 'upstream/master'