Changed version to 1.5 (not snapshot)
Merge branch 'develop' into feature/maven

Conflicts:
	application.properties