Ts Comit
Merge branch 'master' of https://github.com/Pasopeso/CreateHP

Conflicts:
	php/Artist.php