primer commit completo
Merge branch 'master' of github.com:arielmartin80/sociTest

Conflicts:
	application.properties
	target-eclipse/classes/JQueryResourceTagLib.class
	target-eclipse/classes/JQueryTagLib.class
	target-eclipse/classes/grails/plugin/cache/CacheTagLib.class
	target-eclipse/classes/grails/plugin/databasemigration/DbdocController.class
	target-eclipse/classes/org/grails/plugin/resource/ResourceTagLib.class
	target/classes/ApplicationResources.class
	target/classes/BootStrap.class
	target/classes/BuildConfig.class
	target/classes/Config.class
	target/classes/DataSource.class
	target/classes/UrlMappings.class
	target/classes/application.properties
	target/classes/resources.class