commit from desktop
Merge branch 'master' of https://github.com/brunomb-cit/test

Conflicts:
	home/index.php