Merge branch 'master' into develop

# Conflicts:
#	README.md

README.md

@@ -156,6 +156,7 @@ If you think they are super useful and you agree we can look to add them to the
 *   [ ] Add Product link type
 *   [ ] Enable third party field type registration
 *   [ ] Add docs for creating third party field types
+*   [x] Restructure linkit field settings template (it's a bit busy we know!)
 *   [ ] Improve link model docs
 
 Note: This plugin may become a paid add-on when the Craft Plugin store becomes available.