prototipo2

dia 3/12/14 quartafeira
Merge remote-tracking branch 'origin/gr3' into gr3

Conflicts:
	public_html/modules/controllers/aplicativoController.class.php