Modificaciones al 26_Jul_2013
Merge branch 'version2' of github.com:/cmonterrosa/siscco into version2

Conflicts:
	app/views/creditos/vencimiento.rhtml
	app/views/reportes/menu.rhtml