Merge branch 'master' of https://github.com/rubinoske/Comfort-Food

Conflicts:
	native/Comfort-Food/Comfort-Food.xcodeproj/project.pbxproj
as