Add Terms of Use, Privacy Policy, Categories
Commit conflicted versions