changing some minor stuff
changing some minor stuff
Merge remote-tracking branch 'origin/master' into kushan

Conflicts:
	Chef.meV2/Chef.meV2.xcodeproj/project.pbxproj
Adding some changes