Add labeled string format parameter (bug 972551)
Merge pull request #1761 from JaredKerim-Mozilla/972551

Add labeled string format parameter (bug 972551)
Added CORS headers to installed/mine api (bug 972484)
Only consider webapp categories in App API (bug 963129)

I initially removed that because specifying the queryset did an extra
useless query, but it turns out it's not longer the case.
Merge pull request #1759 from diox/fix-api-webapp-categories

Only consider webapp categories in App API (bug 963129)
Converted legal docs to HTML.  Today's lucky number is 18622.
revert django-1.6-dependent code committed too soon