Bump version to 1.0.0
Merge branch 'master' of github.com:selesse/marathon-trainer

Conflicts:
	build.gradle