Merge github/master

Conflicts:
	nbproject/genfiles.properties
	nbproject/project.properties
Merge github/master

Conflicts:
	nbproject/genfiles.properties
	nbproject/project.properties
-Changed method names