Corrected models Atiende and SeRealiza as well as DBManager
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Minor changes to struts.xml