Merge branch 'master' into relations

Conflicts:
	CHANGES.txt
	sql/src/main/java/io/crate/analyze/AbstractInsertAnalyzer.java
	sql/src/main/java/io/crate/analyze/DataStatementAnalyzer.java
	sql/src/main/java/io/crate/analyze/InsertFromValuesAnalyzedStatement.java
	sql/src/main/java/io/crate/analyze/PartitionPropertiesAnalyzer.java
	sql/src/main/java/io/crate/analyze/UpdateAnalyzedStatement.java
	sql/src/main/java/io/crate/analyze/UpdateStatementAnalyzer.java
	sql/src/main/java/io/crate/metadata/ReferenceInfos.java
	sql/src/main/java/io/crate/planner/PlanNodeBuilder.java
	sql/src/main/java/io/crate/planner/Planner.java
	sql/src/test/java/io/crate/analyze/BaseAnalyzerTest.java
	sql/src/test/java/io/crate/analyze/DeleteAnalyzerTest.java
	sql/src/test/java/io/crate/analyze/DropTableAnalyzerTest.java
	sql/src/test/java/io/crate/analyze/SelectAnalyzerTest.java
	sql/src/test/java/io/crate/analyze/UpdateAnalyzerTest.java
	sql/src/test/java/io/crate/integrationtests/SysShardsTest.java
	sql/src/test/java/io/crate/metadata/table/TestingTableInfo.java
	sql/src/test/java/io/crate/planner/PlannerTest.java