Gradle 2.2.1
Merge branch 'develop' of https://github.com/SmasSive/POIWorldline into develop

Conflicts:
	.idea/gradle.xml