Add RecordActivity
Fix AddChild
Merge branch 'master' of github.com:sobhe/khoobha