,
Merge branch 'master' of https://github.com/igorcaldeira/Phaze

Conflicts:
	phazePHP/nbproject/private/private.xml