Added autoapprove links and some new settings
Merge conflicts
Fixing merge conflicts and updated to the latest version