12122014

Final
Merge remote-tracking branch 'origin/inHome' into inHome

Conflicts:
	WebContent/publica/uploadImage.jsp
	build/classes/com/myimage/controller/AutenticacaoController.class
	src/com/myimage/controller/AutenticacaoController.java