Added google's new 'authentic motion'.
Fixed merge conflict.