Qeo 1.0.3
Merge branch 'master' of https://github.com/qeo/qeo-core
Merge branch 'master' into ubuntu

Conflicts:
	gradle-helper/artifactory.gradle