New version of ChallengeEngine with progress calc fixes
214 - need to test
Reuse resources (image and video) in new engine
Merge branch 'iOS-stub' of github.com:stestaub/drallo-app into iOS-stub
Production server
Merge branch 'iOS-stub' into unstable
Merge branch 'unstable' of github.com:stestaub/drallo-app into unstable

Conflicts:
	DralloLibrary/ApplicationContext.cs