Adapted generate javadoc
Adapted travis
Syntax error fix
When on master branch, use version name as docs folder
Syntax fix
Authentication
Only upload stuff if it is not a pull request
With $
Merge branch 'feature_javadoc_ghpages' into dev

Conflicts:
	.travis.yml
	app/build.gradle