Moved over classes and fixed a few merging issues
Merge origin/master

Conflicts:
	nbproject/project.properties