Added keyframing outline to be implemented
Merge remote-tracking branch 'origin/master'