Fixing fatal error by loading plugin files if we are migrating `tantan_wordpress_s3` settings on plugin activation
Merge pull request #51 from deliciousbrains/activation-error-tantan-migration

Fixing fatal error by loading plugin files if we are migrating from old plugin
Merge branch 'develop' into documentation-cleanup

Conflicts:
	amazon-web-services.php