artifactory plugin applied

Conflicts:
	build.gradle
javadoc tasks are back :)
artifactory plugin only applied if java 6 and up

Conflicts:
	build.gradle