Commit do capeta
capeta 2
Merge branch 'master' of https://github.com/PPD4si2012/sirh

Conflicts:
	src/Database/App.Config
	src/PraticaMVC/Web.config
	src/PraticaMVC/bin/DBEntities.dll
	src/PraticaMVC/bin/DBEntities.pdb