PHP Unit and Composer Setup
Merge branch 'master' of github.com:DRDIO/AssemblaPHP

Conflicts:
	tests/Assembla.php