Manut. vm
merge
Merge branch 'master' of https://github.com/PPD4si2012/sirh

Conflicts:
	.gitignore