yotam: some merge fixes, and create challenge final touch (for basic functionality)
Merge remote-tracking branch 'origin/master'