Add error with unknown framework
Update readme
Resolution conflits
Javadoc + Sonatype OSS repository
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.gradle