Merge remote-tracking branch 'origin/master'

Conflicts:
	UesfStore/Src/DAO/ComentarioDao.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	UesfStore/Src/Controller/Controller.php