bug fixed
Merge branch 'master' of github.com:leomanjucs/Github_Release1 into r2_contacts
release2-team2