uploading HTMLawed v1.1.14, 17 Sep 12
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json
uploading HTMLawed v1.1.14, 17 Sep 12