Merge origin/CatapultImplementation

Conflicts:
	nbproject/project.bak.xml