Updated path for answer images
Handle image aspect ratio
Merge remote-tracking branch 'origin/master'

Conflicts:
	ios/Camp Joy Outdoors.xcodeproj/project.pbxproj
Fixed build error
Merge remote-tracking branch 'origin/master'