Adding reader
Fixing folder resolution
Security is not relevant
Fixing resolution paths
Updating version
Merge remote-tracking branch 'marathon/master'

Conflicts:
	build.gradle
Fixing marathon version