added text support without concurrency
concurrent text
Merge branch 'shapes'

Conflicts:
	public/js/directives.js