Merge remote-tracking branch 'origin/master' into 0.2.0-SNAPSHOT

Conflicts:
	pom.xml
Merge remote-tracking branch 'remotes/origin/0.2.0-SNAPSHOT'
Влил хотфиксы