Update 10/09/2014

Continuado o mapeamento das classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Desktop/src/model/CargoDAO.java
	Desktop/src/teste/TesteCargo.java