Cleaned up.

Merge origin/master

Conflicts:
	nbproject/project.properties
Cleaned up.

Merge origin/master

Conflicts:
	nbproject/project.properties
Cleaned up.

Merge origin/master

Conflicts:
	nbproject/project.properties