Circle, Arrow changes
Merge branch 'master' of github.com:prezi/a2p

Conflicts:
	elements.py
Merge branch 'master' of github.com:prezi/a2p