renaming files and classes for PSR-0 support
Fixed 'Text' class name
Merge pull request #21 from wszostak/3.3/develop

Fixed 'Text' class name
Merge branch 'master' into 3.3/develop

Conflicts:
	classes/a1/mango.php
Merge pull request #22 from rjmackay/3.3/develop

Merge master updates in 3.3/develop