initial commit noelia
 commit noelia branch
prueba nw
Merge origin/iniciallocal

Conflicts:
	grails-app/conf/BuildConfig.groovy
	grails-app/views/index.gsp
	grails-app/views/layouts/main.gsp
	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/calendarservice/Calendar.class
	target/classes/calendarservice/CalendarController.class
	target/classes/calendarservice/CalendarEvent.class
	target/classes/calendarservice/CalendarEventGender.class
	target/classes/calendarservice/Category.class
	target/classes/calendarservice/Event.class
	target/classes/calendarservice/Follower.class
	target/classes/calendarservice/FollowerCalendar.class
	target/classes/calendarservice/Gender.class
	target/classes/calendarservice/GroupPermission.class
	target/classes/calendarservice/GroupType.class
	target/classes/calendarservice/Location.class
	target/classes/calendarservice/Permission.class
	target/classes/calendarservice/Session.class
	target/classes/calendarservice/User.class
	target/classes/resources.class
	target/stacktrace.log