Merge branch 'annotation-animation' of github.com:plotly/plotly.js into annotation-animation

Conflicts:
	test/jasmine/tests/transition_test.js

Author: rreusser