added conversion functions to string class. added tests.
added a addCollection method to the collection class
Merge remote-tracking branch 'origin/master'

Conflicts:
	tests/unit/StringTest.php