nov 18 2013
Merge branch 'master' of https://github.com/alfalar/agrinsaweb

Conflicts:
	agrinsa/WebContent/WEB-INF/applicationContext.xml