changes jsonservice to parseservice
removes some classes
merges

Conflicts:
	.DS_Store