added support for editing text... still work in progress
Merge branch 'refs/heads/Hassan'

Conflicts:
	index.html