UPDATED: Configuration, references and target versions.
Merge branch 'master' of https://github.com/gerardino/spacecoatl

Conflicts:
	.idea/gradle.xml
	.idea/modules.xml
	app/app.iml