Uploading version because of nexus didnt refresh correctly
Merge pull request #21 from anallely/master

Uploading version because of nexus didnt refresh correctly
Merge remote-tracking branch 'marathon/master'

Conflicts:
	build.gradle