Merge branch 'release/2.0.0'

# Conflicts:
#	.editorconfig
#	Classes/Backend/Ajax/PageAjax.php
#	Classes/Controller/BackendPageSeoController.php
#	Classes/Hook/SitemapIndexHook.php
#	Classes/Page/Part/MetatagPart.php
#	Classes/Utility/GeneralUtility.php
#	Configuration/TypoScript/setup.txt
#	README.md
#	Resources/Private/Language/locallang.xml
#	Resources/Private/Templates/PageParts/ServicePiwik.html
#	Resources/Public/Backend/JavaScript/MetaSeo.metaeditor.js
#	Resources/Public/Backend/JavaScript/MetaSeo.overview.js
#	composer.json
#	ext_emconf.php
#	ext_tables.php

.editorconfig

@@ -1,13 +1,29 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+charset = utf-8
+trim_trailing_whitespace = true
+
 [*]
 indent_style = space
 indent_size = 4
 
 [*.php]
 indent_style = space
 
-[{setup,constants}.txt]
-indent_style = tab
+[{setup,constants,ext_conf_template}.txt]
+indent_style = space
+
+[*.json]
+indent_style = space
+indent_size = 2
 
 [*.html]
 indent_style = tab
 
+[*.rst]
+indent_style = tab
+
+[Makefile]
+indent_style = tab

.gitignore

@@ -0,0 +1,10 @@
+.settings/
+.buildpath
+*.kdev4
+.project
+.remote_password_hash
+.remote_server
+.remote_username
+tmp
+*~
+.idea

CHANGELOG.md

@@ -0,0 +1,36 @@
+# MetaSEO - Changelog
+
+## MetaSEO 2.0
+
+- Added TYPO3 7.x support
+- Implemented Signals
+- Implemented blacklist of PAGE typeNum in SetupTS
+- Implemented blacklist for index/noindex robots metatag
+- Implemented blacklist for canonical url
+- Implemented canonical url support for mounted pages, pointing to real page instead of mount path (disabled by default)
+- Implemented expiry date for sitemap entries (customizable with SetupTS or Connector)
+- Implemented pagetitle caching (if there is any USER_INT on the current page)
+- Removed own caching solution, using TYPO3 caching framework now
+- Fixed many bugs and issues
+- Fixed coding style (added .editorconfig)
+- Refactored whole extension
+- Added protocol selection for canonical Urls in case protocol is undefined in page properties
+  (via plugin.metaseo.metaTags.canonicalUrl.fallbackProtocol)
+
+## Beta features
+
+- If you have any issues with cached pagetitle: set `plugin.metaseo.pageTitle.caching = 0` to disable this feature.
+
+### Migrate from 1.x to 2.x
+
+- TypoScript Constant `plugin.metaseo.metaTags.useCanonical` changed to `plugin.metaseo.metaTags.canonicalUrl`
+- TypoScript Setup    `plugin.metaseo.metaTags.useCanonical` changed to `plugin.metaseo.metaTags.canonicalUrl`
+- Names of Hooks changed, now camelCase
+
+
+## MetaSEO 1.0 (2014-04-20)
+
+- Version 1.0.0
+- Fork of metaseo
+- Fixed several bugs and improved codebase
+- Fixed and improved manual (now reStructuredText)