Merge origin/master

Conflicts:
	.gitignore
	JavaFX/build.xml
	JavaFX/nbproject/build-impl.xml
	JavaFX/nbproject/genfiles.properties
	JavaFX/nbproject/project.properties
	JavaFX/nbproject/project.xml
	JavaFX/src/javafx/JavaFX.java